wait for reify workers to finish when closing

filecoin-project · Feb 14, 2022 · 4524fbe · 4524fbe
1 parent 6c7abab
commit 4524fbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go
@@ -162,6 +162,7 @@ type SplitStore struct {
 	txnSync         bool
 
 	// background cold object reification
+	reifyWorkers    sync.WaitGroup
 	reifyMx         sync.Mutex
 	reifyCond       sync.Cond
 	reifyPend       map[cid.Cid]struct{}
@@ -707,6 +708,7 @@ func (s *SplitStore) Close() error {
 	}
 
 	s.reifyCond.Broadcast()
+	s.reifyWorkers.Wait()
 	s.cancel()
 	return multierr.Combine(s.markSetEnv.Close(), s.debug.Close())
 }

diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go
@@ -41,6 +41,7 @@ func (s *SplitStore) reifyOrchestrator() {
 	defer close(workch)
 
 	for i := 0; i < workers; i++ {
+		s.reifyWorkers.Add(1)
 		go s.reifyWorker(workch)
 	}
 
@@ -70,6 +71,7 @@ func (s *SplitStore) reifyOrchestrator() {
 }
 
 func (s *SplitStore) reifyWorker(workch chan cid.Cid) {
+	defer s.reifyWorkers.Done()
 	for c := range workch {
 		s.doReify(c)
 	}