Merge pull request #6085 from ipfs/fix/thread-safe-mem-datastore

make in-memory datastore thread-safe
ipfs · Mar 16, 2019 · 221d1b1 · 221d1b1
2 parents 65d093c + 3c383bc
commit 221d1b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/repo/fsrepo/datastores.go b/repo/fsrepo/datastores.go
@@ -10,6 +10,7 @@ import (
 
 	ds "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/mount"
+	dssync "github.com/ipfs/go-datastore/sync"
 	"github.com/ipfs/go-ds-measure"
 )
 
@@ -174,7 +175,7 @@ func (c *memDatastoreConfig) DiskSpec() DiskSpec {
 }
 
 func (c *memDatastoreConfig) Create(string) (repo.Datastore, error) {
-	return ds.NewMapDatastore(), nil
+	return dssync.MutexWrap(ds.NewMapDatastore()), nil
 }
 
 type logDatastoreConfig struct {

diff --git a/repo/repo.go b/repo/repo.go
@@ -59,5 +59,5 @@ type Repo interface {
 // Datastore is the interface required from a datastore to be
 // acceptable to FSRepo.
 type Datastore interface {
-	ds.Batching // should be threadsafe, just be careful
+	ds.Batching // must be thread-safe
 }