Add lock around catchpointsMu to avoid race condition (#3944)

Eric-Warehime · web-flow · commit cd4015a00c47 · 2022-05-03T00:41:03.000-04:00
While upgrading to golang 1.17.9 a couple of race conditions have been detected during E2E tests.
This fixes catchpoint label assignment.
diff --git a/ledger/catchpointtracker.go b/ledger/catchpointtracker.go
@@ -413,20 +413,18 @@ func (ct *catchpointTracker) postCommit(ctx context.Context, dcc *deferredCommit
 		}
 	}
 
+	ct.catchpointsMu.Lock()
+	ct.roundDigest = ct.roundDigest[dcc.offset:]
 	if dcc.isCatchpointRound && dcc.catchpointLabel != "" {
 		ct.lastCatchpointLabel = dcc.catchpointLabel
 	}
+	ct.catchpointsMu.Unlock()
+
 	dcc.updatingBalancesDuration = time.Since(dcc.flushTime)
 
 	if dcc.updateStats {
 		dcc.stats.MemoryUpdatesDuration = time.Duration(time.Now().UnixNano())
 	}
-
-	ct.catchpointsMu.Lock()
-
-	ct.roundDigest = ct.roundDigest[dcc.offset:]
-
-	ct.catchpointsMu.Unlock()
 }
 
 func (ct *catchpointTracker) postCommitUnlocked(ctx context.Context, dcc *deferredCommitContext) {

Original file line number	Diff line number	Diff line change
`@@ -413,20 +413,18 @@ func (ct catchpointTracker) postCommit(ctx context.Context, dcc deferredCommit`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
	`416`	`+ ct.catchpointsMu.Lock()`
	`417`	`+ ct.roundDigest = ct.roundDigest[dcc.offset:]`
`416`	`418`	`if dcc.isCatchpointRound && dcc.catchpointLabel != "" {`
`417`	`419`	`ct.lastCatchpointLabel = dcc.catchpointLabel`
`418`	`420`	`}`
	`421`	`+ ct.catchpointsMu.Unlock()`
	`422`	`+`
`419`	`423`	`dcc.updatingBalancesDuration = time.Since(dcc.flushTime)`
`420`	`424`
`421`	`425`	`if dcc.updateStats {`
`422`	`426`	`dcc.stats.MemoryUpdatesDuration = time.Duration(time.Now().UnixNano())`
`423`	`427`	`}`
`424`		`-`
`425`		`- ct.catchpointsMu.Lock()`
`426`		`-`
`427`		`- ct.roundDigest = ct.roundDigest[dcc.offset:]`
`428`		`-`
`429`		`- ct.catchpointsMu.Unlock()`
`430`	`428`	`}`
`431`	`429`
`432`	`430`	`func (ct catchpointTracker) postCommitUnlocked(ctx context.Context, dcc deferredCommitContext) {`