fix: synchronize access to chainsyncBlockfetchBusyTime (#1198)

chrisguiney · web-flow · commit 4e28826e62db · 2026-01-17T04:44:05.000-08:00
Signed-off-by: Chris Guiney &lt;chris@guiney.net&gt;
diff --git a/ledger/chainsync.go b/ledger/chainsync.go
@@ -225,6 +225,8 @@ func (ls *LedgerState) handleEventBlockfetchBlock(e BlockfetchEvent) error {
 		e,
 	)
 	// Update busy time in order to detect fetch timeout
+	ls.chainsyncBlockfetchBusyTimeMutex.Lock()
+	defer ls.chainsyncBlockfetchBusyTimeMutex.Unlock()
 	ls.chainsyncBlockfetchBusyTime = time.Now()
 	return nil
 }
@@ -576,7 +578,10 @@ func (ls *LedgerState) blockfetchRequestRangeStart(
 		return fmt.Errorf("request block range: %w", err)
 	}
 	// Reset blockfetch busy time
+	ls.chainsyncBlockfetchBusyTimeMutex.Lock()
 	ls.chainsyncBlockfetchBusyTime = time.Now()
+	ls.chainsyncBlockfetchBusyTimeMutex.Unlock()
+
 	// Create our blockfetch done signal channels
 	ls.chainsyncBlockfetchReadyChan = make(chan struct{})
 	ls.chainsyncBlockfetchBatchDoneChan = make(chan struct{})
@@ -589,8 +594,12 @@ func (ls *LedgerState) blockfetchRequestRangeStart(
 			case <-time.After(500 * time.Millisecond):
 			}
 			// Clear blockfetch busy flag on timeout
+			ls.chainsyncBlockfetchBusyTimeMutex.Lock()
+			busyTime := ls.chainsyncBlockfetchBusyTime
+			ls.chainsyncBlockfetchBusyTimeMutex.Unlock()
+
 			if time.Since(
-				ls.chainsyncBlockfetchBusyTime,
+				busyTime,
 			) > blockfetchBusyTimeout {
 				ls.blockfetchRequestRangeCleanup(true)
 				ls.config.Logger.Warn(
diff --git a/ledger/state.go b/ledger/state.go
@@ -290,6 +290,7 @@ type LedgerState struct {
 	metrics                          stateMetrics
 	currentEra                       eras.EraDesc
 	config                           LedgerStateConfig
+	chainsyncBlockfetchBusyTimeMutex sync.Mutex // protects chainsyncBlockfetchBusyTime
 	chainsyncBlockfetchBusyTime      time.Time
 	currentPParams                   lcommon.ProtocolParameters
 	mempool                          MempoolProvider
