fix handling of filestore nodes in mfs during add

License: MIT Signed-off-by: Jeromy <[email protected]>
ipfs · Mar 22, 2017 · e876434 · e876434
1 parent 62bb7c9
commit e876434
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
@@ -21,6 +21,7 @@ import (
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	mfs "github.com/ipfs/go-ipfs/mfs"
 	"github.com/ipfs/go-ipfs/pin"
+	posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo"
 	unixfs "github.com/ipfs/go-ipfs/unixfs"
 
 	ds "gx/ipfs/QmRWDav6mzWseLWeYfVd5fvUKiVe9xNH29YfMF438fG364/go-datastore"
@@ -349,6 +350,10 @@ func (adder *Adder) addNode(node node.Node, path string) error {
 		path = node.Cid().String()
 	}
 
+	if pi, ok := node.(*posinfo.FilestoreNode); ok {
+		node = pi.Node
+	}
+
 	dir := gopath.Dir(path)
 	if dir != "." {
 		if err := mfs.Mkdir(adder.mr, dir, true, false); err != nil {

diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh
@@ -207,6 +207,20 @@ test_add_named_pipe() {
     '
 }
 
+test_add_sharded_dir() {
+	mkdir testdata
+	for i in `seq 2000`
+	do
+		echo $i > testdata/file$i
+	done
+
+	test_expect_success "ipfs add on very large directory succeeds" '
+		ipfs add -r -q testdata | tail -n1 > sharddir_out &&
+		echo QmSCJD1KYLhVVHqBK3YyXuoEqHt7vggyJhzoFYbT8v1XYL > sharddir_exp &&
+		test_cmp sharddir_exp sharddir_out
+	'
+}
+
 test_add_pwd_is_symlink() {
     test_expect_success "ipfs add -r adds directory content when ./ is symlink" '
       mkdir hellodir &&
@@ -439,6 +453,8 @@ test_kill_ipfs_daemon
 
 test_add_cat_file
 
+test_add_sharded_dir
+
 test_add_cat_raw
 
 test_expect_success "ipfs add --only-hash succeeds" '
@@ -459,6 +475,8 @@ test_launch_ipfs_daemon --offline
 
 test_add_cat_file
 
+test_add_sharded_dir
+
 test_kill_ipfs_daemon
 
 test_done