Merge pull request #5319 from filecoin-project/fix/fsm-startup-race

storagefsm: Fix unsealedInfoMap.lk init race
filecoin-project · Jan 11, 2021 · 7d0296c · 7d0296c
2 parents 3ce2964 + 299e724
commit 7d0296c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/extern/storage-sealing/fsm.go b/extern/storage-sealing/fsm.go
@@ -409,8 +409,9 @@ func (m *Sealing) restartSectors(ctx context.Context) error {
 		return err
 	}
 
-	m.unsealedInfoMap.lk.Lock()
+	// m.unsealedInfoMap.lk.Lock() taken early in .New to prevent races
 	defer m.unsealedInfoMap.lk.Unlock()
+
 	for _, sector := range trackedSectors {
 		if err := m.sectors.Send(uint64(sector.SectorNumber), SectorRestart{}); err != nil {
 			log.Errorf("restarting sector %d: %+v", sector.SectorNumber, err)

diff --git a/extern/storage-sealing/sealing.go b/extern/storage-sealing/sealing.go
@@ -145,6 +145,8 @@ func New(api SealingAPI, fc FeeConfig, events Events, maddr address.Address, ds
 
 	s.sectors = statemachine.New(namespace.Wrap(ds, datastore.NewKey(SectorStorePrefix)), s, SectorInfo{})
 
+	s.unsealedInfoMap.lk.Lock() // released after initialized in .Run()
+
 	return s
 }