Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make in-memory datastore thread-safe #6085

Merged
merged 1 commit into from
Mar 16, 2019
Merged

make in-memory datastore thread-safe #6085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion repo/fsrepo/datastores.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}