Merge pull request #465 from ipfs/fix/startup-race

fix a startup race by creating the blockstoremanager process on init
ipfs · Feb 26, 2021 · d1d4afa · d1d4afa
2 parents 47b99b1 + 0f5cc8b
commit d1d4afa
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/internal/decision/blockstoremanager.go b/internal/decision/blockstoremanager.go
@@ -26,24 +26,24 @@ func newBlockstoreManager(bs bstore.Blockstore, workerCount int) *blockstoreMana
 		bs:          bs,
 		workerCount: workerCount,
 		jobs:        make(chan func()),
+		px:          process.WithTeardown(func() error { return nil }),
 	}
 }
 
 func (bsm *blockstoreManager) start(px process.Process) {
-	bsm.px = px
-
+	px.AddChild(bsm.px)
 	// Start up workers
 	for i := 0; i < bsm.workerCount; i++ {
-		px.Go(func(px process.Process) {
-			bsm.worker()
+		bsm.px.Go(func(px process.Process) {
+			bsm.worker(px)
 		})
 	}
 }
 
-func (bsm *blockstoreManager) worker() {
+func (bsm *blockstoreManager) worker(px process.Process) {
 	for {
 		select {
-		case <-bsm.px.Closing():
+		case <-px.Closing():
 			return
 		case job := <-bsm.jobs:
 			job()