Enhance conversion tests.

convert_test.go

@@ -20,71 +20,203 @@ func TestMove(t *testing.T) {
 	defer cleanup()
 
 	v1dir := filepath.Join(tempdir, "v1")
-	err := flatfs.Create(v1dir, flatfs.Prefix(3))
-	if err != nil {
-		t.Fatalf("Create fail: %v\n", err)
-	}
-	err = ioutil.WriteFile(filepath.Join(v1dir, "README_ALSO"), []byte("something"), 0666)
+	createDatastore(t, v1dir, flatfs.Prefix(3))
+
+	err := ioutil.WriteFile(filepath.Join(v1dir, "README_ALSO"), []byte("something"), 0666)
 	if err != nil {
 		t.Fatalf("WriteFile fail: %v\n", err)
 	}
-	v1, err := flatfs.Open(v1dir, false)
+
+	keys, blocks := populateDatastore(t, v1dir)
+
+	v2dir := filepath.Join(tempdir, "v2")
+	createDatastore(t, v2dir, flatfs.NextToLast(2))
+
+	err = flatfs.Move(v1dir, v2dir, nil)
 	if err != nil {
-		t.Fatalf("New fail: %v\n", err)
+		t.Fatalf("%v\n", err)
 	}
 
-	r := rand.New()
-	var blocks [][]byte
-	var keys []datastore.Key
-	for i := 0; i < 256; i++ {
-		blk := make([]byte, 1000)
-		r.Read(blk)
-		blocks = append(blocks, blk)
+	// make sure the directory empty
+	rmEmptyDatastore(t, v1dir)
 
-		key := "x" + hex.EncodeToString(blk[:8])
-		keys = append(keys, datastore.NewKey(key))
-		err := v1.Put(keys[i], blocks[i])
+	// make sure the README file moved
+	_, err = os.Stat(filepath.Join(v2dir, "README_ALSO"))
 	if err != nil {
-			t.Fatalf("Put fail: %v\n", err)
+		t.Fatalf(err.Error())
 	}
+
+	// check that all keys are available
+	checkKeys(t, v2dir, keys, blocks)
+
+	// check that a key is in the correct format
+	shard := filepath.Join(v2dir, flatfs.NextToLast(2).Func()(keys[0].String()))
+	_, err = os.Stat(shard)
+	if err != nil {
+		t.Fatalf(err.Error())
 	}
+}
 
+func TestMoveRestart(t *testing.T) {
+	tempdir, cleanup := tempdir(t)
+	defer cleanup()
+
+	v1dir := filepath.Join(tempdir, "v1")
 	v2dir := filepath.Join(tempdir, "v2")
-	err = flatfs.Create(v2dir, flatfs.NextToLast(2))
+
+	createDatastore(t, v1dir, flatfs.Prefix(3))
+
+	createDatastore(t, v2dir, flatfs.NextToLast(5))
+
+	keys, blocks := populateDatastore(t, v1dir)
+	checkKeys(t, v1dir, keys, blocks)
+
+	// get a directory in the datastore
+	noslash := keys[0].String()[1:]
+	aDir := filepath.Join(tempdir, "v1", flatfs.Prefix(3).Func()(noslash))
+
+	// create a permission problem on the directory
+	err := os.Chmod(aDir, 0500)
 	if err != nil {
-		t.Fatalf("Mkdir fail: %v\n", err)
+		t.Fatalf("%v\n", err)
 	}
-	flatfs.Move(v1dir, v2dir, nil)
 
-	// This should fail if the directory is not empty
-	err = os.Remove(v1dir)
-	if err != nil {
-		t.Fatalf("Remove fail: %v\n", err)
+	// try the move it should fail partly through
+	err = flatfs.Move(v1dir, v2dir, nil)
+	if err == nil {
+		t.Fatalf("Move should have failed.", err)
 	}
 
-	// Make sure the README file moved
-	_, err = os.Stat(filepath.Join(v2dir, "README_ALSO"))
+	// okay try to undo should be okay
+	err = flatfs.Move(v2dir, v1dir, nil)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("Could not undo the move.", err)
 	}
+	checkKeys(t, v1dir, keys, blocks)
 
-	v2, err := flatfs.Open(v2dir, false)
-	if err != nil {
-		t.Fatalf("New fail: %v\n", err)
+	// there should be nothing left in the new datastore
+	rmEmptyDatastore(t, v2dir)
+	
+	// try the move again, again should fail
+	createDatastore(t, v2dir, flatfs.NextToLast(2))
+	err = flatfs.Move(v1dir, v2dir, nil)
+	if err == nil {
+		t.Fatalf("Move should have failed.", err)
 	}
 
-	// Sanity check, make sure we can retrieve a new key
-	data, err := v2.Get(keys[0])
+	// fix the permission problem
+	err = os.Chmod(aDir, 0700)
 	if err != nil {
-		t.Fatalf("Get fail: %v\n", err)
+		t.Fatalf("%v\n", err)
 	}
-	if !bytes.Equal(data.([]byte), blocks[0]) {
-		t.Fatalf("block context differ for key %s\n", keys[0].String())
+
+	// restart the move, it should be okay now
+	err = flatfs.Move(v1dir, v2dir, nil)
+	if err != nil {
+		t.Fatalf("Move not okay: %v\n", err)
 	}
 
+	// make sure everything moved by removing the old directory
+	rmEmptyDatastore(t, v1dir)
+
+	// make sure everything moved by checking all keys
+	checkKeys(t, v2dir, keys, blocks)
+
+	// check that a key is in the correct format
 	shard := filepath.Join(v2dir, flatfs.NextToLast(2).Func()(keys[0].String()))
 	_, err = os.Stat(shard)
 	if err != nil {
 		t.Fatalf(err.Error())
 	}
 }
+
+func TestUpgradeDownload(t *testing.T) {
+	tempdir, cleanup := tempdir(t)
+	defer cleanup()
+
+	createDatastore(t, tempdir, flatfs.Prefix(3))
+
+	keys, blocks := populateDatastore(t, tempdir)
+	checkKeys(t, tempdir, keys, blocks)
+
+	//err := flatfs.UpgradeV0toV1(tempdir, 3)
+	//if err == nil {
+	//	t.Fatalf("UpgradeV0toV1 on already v1 should fail.")
+	//}
+
+	err := flatfs.DowngradeV1toV0(tempdir)
+	if err != nil {
+		t.Fatalf("DowngradeV1toV0 fail: %v\n", err)
+	}
+
+	_, err = os.Stat(filepath.Join(tempdir, flatfs.SHARDING_FN))
+	if err == nil {
+		t.Fatalf("%v not in v0 format, SHARDING FILE exists")
+	} else if !os.IsNotExist(err) {
+		t.Fatalf("Stat fail: %v\n", err)
+	}
+
+	err = flatfs.UpgradeV0toV1(tempdir, 3)
+	if err != nil {
+		t.Fatalf("UpgradeV0toV1 fail %v\n", err)
+	}
+
+	// This will fail unless the repository is in the new version
+	checkKeys(t, tempdir, keys, blocks)
+}
+
+func createDatastore(t *testing.T, dir string, fun *flatfs.ShardIdV1) {
+	err := flatfs.Create(dir, fun)
+	if err != nil {
+		t.Fatalf("Create fail: %s: %v\n", dir, err)
+	}
+}
+
+func rmEmptyDatastore(t *testing.T, dir string) {
+	err := os.Remove(dir)
+	if err != nil {
+		t.Fatalf("Remove fail: %v\n", err)
+	}
+}
+
+func populateDatastore(t *testing.T, dir string) ([]datastore.Key, [][]byte) {
+	ds, err := flatfs.Open(dir, false)
+	if err != nil {
+		t.Fatalf("Open fail: %v\n", err)
+	}
+
+	r := rand.New()
+	var blocks [][]byte
+	var keys []datastore.Key
+	for i := 0; i < 256; i++ {
+		blk := make([]byte, 1000)
+		r.Read(blk)
+		blocks = append(blocks, blk)
+
+		key := "x" + hex.EncodeToString(blk[:8])
+		keys = append(keys, datastore.NewKey(key))
+		err := ds.Put(keys[i], blocks[i])
+		if err != nil {
+			t.Fatalf("Put fail: %v\n", err)
+		}
+	}
+
+	return keys, blocks
+}
+
+func checkKeys(t *testing.T, dir string, keys []datastore.Key, blocks [][]byte) {
+	ds, err := flatfs.Open(dir, false)
+	if err != nil {
+		t.Fatalf("Open fail: %v\n", err)
+	}
+
+	for i, key := range keys {
+		data, err := ds.Get(key)
+		if err != nil {
+			t.Fatalf("Get fail: %v\n", err)
+		}
+		if !bytes.Equal(data.([]byte), blocks[i]) {
+			t.Fatalf("block context differ for key %s\n", key.String())
+		}
+	}
+}