Merge pull request #1985 from ipfs/rht-add-no-sync

Add config option for flatfs no-sync
ipfs · Nov 20, 2015 · b4ab684 · b4ab684
2 parents 856e250 + cab5868
commit b4ab684
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 43 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/coalesce/coalesce.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/coalesce/coalesce.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/elastigo/datastore.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/elastigo/datastore.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs_test.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-datastore/timecache/timecache.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/timecache/timecache.go
diff --git a/repo/config/datastore.go b/repo/config/datastore.go
@@ -16,6 +16,7 @@ type Datastore struct {
 	GCPeriod           string // in ns, us, ms, s, m, h
 
 	Params *json.RawMessage
+	NoSync bool
 }
 
 func (d *Datastore) ParamData() []byte {

diff --git a/repo/fsrepo/defaultds.go b/repo/fsrepo/defaultds.go
@@ -39,7 +39,8 @@ func openDefaultDatastore(r *FSRepo) (repo.Datastore, error) {
 	// including "/" from datastore.Key and 2 bytes from multihash. To
 	// reach a uniform 256-way split, we need approximately 4 bytes of
 	// prefix.
-	blocksDS, err := flatfs.New(path.Join(r.path, flatfsDirectory), 4)
+	syncfs := !r.config.Datastore.NoSync
+	blocksDS, err := flatfs.New(path.Join(r.path, flatfsDirectory), 4, syncfs)
 	if err != nil {
 		return nil, fmt.Errorf("unable to open flatfs datastore: %v", err)
 	}