Merge pull request ipfs/go-ipfs-blockstore#50 from RTradeLtd/racef

add race fix for HashOnRead This commit was moved from ipfs/go-ipfs-blockstore@8549146
ipfs · Apr 13, 2020 · 7599211 · 7599211
2 parents cf01195 + 960beb2
commit 7599211
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go
@@ -15,6 +15,7 @@ import (
 	dsq "github.com/ipfs/go-datastore/query"
 	dshelp "github.com/ipfs/go-ipfs-ds-help"
 	logging "github.com/ipfs/go-log"
+	uatomic "go.uber.org/atomic"
 )
 
 var log = logging.Logger("blockstore")
@@ -101,17 +102,18 @@ func NewBlockstore(d ds.Batching) Blockstore {
 	dsb = dd
 	return &blockstore{
 		datastore: dsb,
+		rehash:    uatomic.NewBool(false),
 	}
 }
 
 type blockstore struct {
 	datastore ds.Batching
 
-	rehash bool
+	rehash *uatomic.Bool
 }
 
 func (bs *blockstore) HashOnRead(enabled bool) {
-	bs.rehash = enabled
+	bs.rehash.Store(enabled)
 }
 
 func (bs *blockstore) Get(k cid.Cid) (blocks.Block, error) {
@@ -126,7 +128,7 @@ func (bs *blockstore) Get(k cid.Cid) (blocks.Block, error) {
 	if err != nil {
 		return nil, err
 	}
-	if bs.rehash {
+	if bs.rehash.Load() {
 		rbcid, err := k.Prefix().Sum(bdata)
 		if err != nil {
 			return nil, err