util: resolve data race (pingcap#14610)

hsqlu · hsqlu · commit 53c2eb1aff84 · 2020-02-08T01:32:13.000+13:00
diff --git a/util/stmtsummary/statement_summary.go b/util/stmtsummary/statement_summary.go
@@ -727,9 +727,10 @@ func (ssElement *stmtSummaryByDigestElement) add(sei *StmtExecInfo, intervalSeco
 		if commitDetails.GetCommitTsTime > ssElement.maxGetCommitTsTime {
 			ssElement.maxGetCommitTsTime = commitDetails.GetCommitTsTime
 		}
-		ssElement.sumCommitBackoffTime += commitDetails.CommitBackoffTime
-		if commitDetails.CommitBackoffTime > ssElement.maxCommitBackoffTime {
-			ssElement.maxCommitBackoffTime = commitDetails.CommitBackoffTime
+		commitBackoffTime := atomic.LoadInt64(&commitDetails.CommitBackoffTime)
+		ssElement.sumCommitBackoffTime += commitBackoffTime
+		if commitBackoffTime > ssElement.maxCommitBackoffTime {
+			ssElement.maxCommitBackoffTime = commitBackoffTime
 		}
 		resolveLockTime := atomic.LoadInt64(&commitDetails.ResolveLockTime)
 		ssElement.sumResolveLockTime += resolveLockTime

Original file line number	Diff line number	Diff line change
`@@ -727,9 +727,10 @@ func (ssElement stmtSummaryByDigestElement) add(sei StmtExecInfo, intervalSeco`
`727`	`727`	`if commitDetails.GetCommitTsTime > ssElement.maxGetCommitTsTime {`
`728`	`728`	`ssElement.maxGetCommitTsTime = commitDetails.GetCommitTsTime`
`729`	`729`	`}`
`730`		`- ssElement.sumCommitBackoffTime += commitDetails.CommitBackoffTime`
`731`		`- if commitDetails.CommitBackoffTime > ssElement.maxCommitBackoffTime {`
`732`		`- ssElement.maxCommitBackoffTime = commitDetails.CommitBackoffTime`
	`730`	`+ commitBackoffTime := atomic.LoadInt64(&commitDetails.CommitBackoffTime)`
	`731`	`+ ssElement.sumCommitBackoffTime += commitBackoffTime`
	`732`	`+ if commitBackoffTime > ssElement.maxCommitBackoffTime {`
	`733`	`+ ssElement.maxCommitBackoffTime = commitBackoffTime`
`733`	`734`	`}`
`734`	`735`	`resolveLockTime := atomic.LoadInt64(&commitDetails.ResolveLockTime)`
`735`	`736`	`ssElement.sumResolveLockTime += resolveLockTime`