fixes to make 0.4.3 install and migration work properly

Author: whyrusleeping

Godeps/_workspace/src/github.com/ipfs/ipfs-update/util/utils.go

@@ -53,9 +53,10 @@ func New(path string, prefixLen int, sync bool) (*Datastore, error) {
 var padding = strings.Repeat("_", maxPrefixLen)
 
 func (fs *Datastore) encode(key datastore.Key) (dir, file string) {
-	prefix := (key.String() + padding)[:fs.prefixLen]
+	noslash := key.String()[1:]
+	prefix := (noslash + padding)[:fs.prefixLen]
 	dir = path.Join(fs.path, prefix)
-	file = path.Join(dir, key.String()+extension)
+	file = path.Join(dir, noslash+extension)
 	return dir, file
 }
 
@@ -114,7 +115,7 @@ func (fs *Datastore) Put(key datastore.Key, value interface{}) error {
 			return err
 		}
 
-		log.Printf("too many open files, retrying in %dms\n", 100*i)
+		log.Printf("too many open files, retrying in %dms", 100*i)
 		time.Sleep(time.Millisecond * 100 * time.Duration(i))
 	}
 	return err

ipfs-3-to-4/flatfs/flatfs.go

@@ -152,7 +152,7 @@ func TestStorage(t *testing.T) {
 	defer cleanup()
 
 	const prefixLen = 2
-	const prefix = "q"
+	const prefix = "qu"
 	const target = prefix + string(os.PathSeparator) + "quux.data"
 	fs, err := flatfs.New(temp, prefixLen, false)
 	if err != nil {

ipfs-3-to-4/flatfs/flatfs_test.go

@@ -182,7 +182,7 @@ func openDatastores(repopath string) (a, b dstore.ThreadSafeDatastore, e error)
 	}
 
 	blockspath := path.Join(repopath, "blocks")
-	nfds, err := nuflatfs.New(blockspath, 7, true)
+	nfds, err := nuflatfs.New(blockspath, 5, true)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -277,6 +277,7 @@ func rewriteKeys(oldds, newds dstore.Datastore, pref string, mkKey mkKeyFunc, va
 			return err
 		}
 	}
+	fmt.Println()
 
 	return nil
 }

ipfs-3-to-4/migration/migration.go

@@ -16,6 +16,7 @@ BINS += bin/fs-repo-migrations
 BINS += bin/ipfs-0-to-1
 BINS += bin/ipfs-1-to-2
 BINS += bin/ipfs-2-to-3
+BINS += bin/ipfs-3-to-4
 BINS += bin/ipfs-update
 BINS += bin/random-files
 BINS += bin/go-sleep
@@ -25,6 +26,7 @@ FS_REPO_SRC = ../
 IPFS_0_TO_1_SRC = ../ipfs-0-to-1
 IPFS_1_TO_2_SRC = ../ipfs-1-to-2
 IPFS_2_TO_3_SRC = ../ipfs-2-to-3
+IPFS_3_TO_4_SRC = ../ipfs-3-to-4
 IPFS_UPDATE_SRC = ../Godeps/_workspace/src/github.com/ipfs/ipfs-update
 
 # User might want to override those on the command line
@@ -87,6 +89,10 @@ bin/ipfs-2-to-3: $(call find_go_files, $(IPFS_2_TO_3_SRC)) BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o $@ $(IPFS_2_TO_3_SRC)
 
+bin/ipfs-3-to-4: $(call find_go_files, $(IPFS_3_TO_4_SRC)) BUILD-OPTIONS
+	@echo "*** installing $@ ***"
+	go build $(GOFLAGS) -o $@ $(IPFS_3_TO_4_SRC)
+
 BUILD-OPTIONS: FORCE
 	@bin/checkflags '$@' '$(GOFLAGS)' '*** new Go flags ***'
 

sharness/Makefile

@@ -82,6 +82,7 @@ GUEST_FS_REPO_MIG="sharness/bin/fs-repo-migrations"
 GUEST_IPFS_0_TO_1="sharness/bin/ipfs-0-to-1"
 GUEST_IPFS_1_TO_2="sharness/bin/ipfs-1-to-2"
 GUEST_IPFS_2_TO_3="sharness/bin/ipfs-2-to-3"
+GUEST_IPFS_3_TO_4="sharness/bin/ipfs-3-to-4"
 
 GUEST_RANDOM_FILES="sharness/bin/random-files"
 

sharness/lib/test-lib.sh

@@ -13,7 +13,7 @@ test_expect_success "'fs-repo-migrations -v' works" '
 '
 
 test_expect_success "'fs-repo-migrations -v' output looks good" '
-	echo "3" >expected &&
+	echo "4" >expected &&
 	test_cmp expected actual
 '
 
@@ -30,7 +30,7 @@ test_expect_success "'fs-repo-migrations -v' works" '
 '
 
 test_expect_success "'fs-repo-migrations -v' output looks good" '
-	echo "3" >expected &&
+	echo "4" >expected &&
 	test_cmp expected actual
 '
 
@@ -47,7 +47,7 @@ test_expect_success ".ipfs/ has been created" '
 '
 
 test_expect_success "'fs-repo-migrations -y' works" '
-	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y" >actual
+	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y -to=3" >actual
 '
 
 test_expect_success "'fs-repo-migrations -y' output looks good" '

sharness/t0030-simple-migration.sh

@@ -48,7 +48,7 @@ test_expect_success "ipfs cat output looks good" '
 '
 
 test_expect_success "'fs-repo-migrations -y' works" '
-	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y" >actual
+	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y -to=3" >actual
 '
 
 test_expect_success "'fs-repo-migrations -y' output looks good" '

sharness/t0040-migration-2-3.sh

@@ -81,7 +81,7 @@ test_expect_success "'ipfs pin ls --type=all' works" '
 '
 
 test_expect_success "'fs-repo-migrations -y' works" '
-	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y" >actual
+	exec_docker "$DOCID" "$GUEST_FS_REPO_MIG -y -to=3" >actual
 '
 
 test_expect_success "'fs-repo-migrations -y' output looks good" '