Merge pull request #3185 from karalabe/fix-log-race

eth/downloader: fix a data race in a log output
8 years ago · 437c1e40b2
parent 28cc3cc960 53db80da89
commit 437c1e40b2
1 changed files with 2 additions and 1 deletions
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@ -948,11 +948,12 @@ func (d *Downloader) fetchNodeData() error {
 				}
 				d.syncStatsLock.Lock()
 				d.syncStatsStateDone += uint64(delivered)
+				syncStatsStateDone := d.syncStatsStateDone // Thread safe copy for the log below
 				d.syncStatsLock.Unlock()

 				// Log a message to the user and return
 				if delivered > 0 {
-					glog.V(logger.Info).Infof("imported %3d state entries in %9v: processed %d, pending at least %d", delivered, common.PrettyDuration(time.Since(start)), d.syncStatsStateDone, pending)
+					glog.V(logger.Info).Infof("imported %3d state entries in %9v: processed %d, pending at least %d", delivered, common.PrettyDuration(time.Since(start)), syncStatsStateDone, pending)
 				}
 			})
 		}