Merge pull request #6156 from ipfs/fix/6139

fix add error handling

core/coreapi/unixfs.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/ipfs/go-ipfs/core"
-	"github.com/ipfs/go-ipfs/filestore"
 
 	"github.com/ipfs/go-ipfs/core/coreunix"
 
@@ -49,8 +48,8 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
 	//	return
 	//}
 
-	if settings.NoCopy && !cfg.Experimental.FilestoreEnabled {
-		return nil, filestore.ErrFilestoreNotEnabled
+	if settings.NoCopy && !(cfg.Experimental.FilestoreEnabled || cfg.Experimental.UrlstoreEnabled) {
+		return nil, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://git.io/vNItf")
 	}
 
 	addblockstore := api.blockstore

core/coreunix/add.go

@@ -104,9 +104,6 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
 		return nil, err
 	}
 
-	// Make sure all added nodes are written when done.
-	defer adder.bufferedDS.Commit()
-
 	params := ihelper.DagBuilderParams{
 		Dagserv:    adder.bufferedDS,
 		RawLeaves:  adder.RawLeaves,
@@ -119,11 +116,17 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
 	if err != nil {
 		return nil, err
 	}
+	var nd ipld.Node
 	if adder.Trickle {
-		return trickle.Layout(db)
+		nd, err = trickle.Layout(db)
+	} else {
+		nd, err = balanced.Layout(db)
+	}
+	if err != nil {
+		return nil, err
 	}
 
-	return balanced.Layout(db)
+	return nd, adder.bufferedDS.Commit()
 }
 
 // RootNode returns the mfs root node

test/sharness/t0270-filestore.sh

@@ -68,13 +68,24 @@ init_ipfs_filestore() {
 
   test_init_ipfs
 
+  # Check the _early_ error message
   test_expect_success "nocopy add errors and has right message" '
     test_must_fail ipfs add --nocopy -r somedir 2> add_out &&
-      grep "filestore is not enabled" add_out
+      grep "either the filestore or the urlstore must be enabled" add_out
+  '
+
+  test_expect_success "enable urlstore config setting" '
+    ipfs config --json Experimental.UrlstoreEnabled true
   '
 
+  # Check the _late_ error message
+  test_expect_success "nocopy add errors and has right message when the urlstore is enabled" '
+    test_must_fail ipfs add --nocopy -r somedir 2> add_out &&
+      grep "filestore is not enabled" add_out
+  '
 
   test_expect_success "enable filestore config setting" '
+    ipfs config --json Experimental.UrlstoreEnabled true &&
     ipfs config --json Experimental.FilestoreEnabled true
   '
 }