From 3c135e50a9d8676d594e0ec30a8904adf3a86824 Mon Sep 17 00:00:00 2001 From: pingcap-github-bot Date: Thu, 13 Feb 2020 20:15:13 +0800 Subject: [PATCH] util: resolve data race (#14778) --- util/stmtsummary/statement_summary.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/util/stmtsummary/statement_summary.go b/util/stmtsummary/statement_summary.go index eda997201889f..7d48b064694de 100644 --- a/util/stmtsummary/statement_summary.go +++ b/util/stmtsummary/statement_summary.go @@ -728,9 +728,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