fs: Migrate object metadata to objects directory. (#4195)

Fixes #3352
2025-11-29 05:19:03 -05:00 · 2017-05-05 08:49:09 -07:00
parent 99ddd35343
commit 76f4f20609
13 changed files with 775 additions and 93 deletions
--- a/cmd/fs-v1_test.go
+++ b/cmd/fs-v1_test.go
@@ -22,6 +22,8 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/minio/minio/pkg/lock"
 )

 // TestNewFS - tests initialization of all input disks
@@ -85,8 +87,8 @@ func TestFSShutdown(t *testing.T) {
 	}
 }

-// TestFSLoadFormatFS - test loadFormatFS with healty and faulty disks
-func TestFSLoadFormatFS(t *testing.T) {
+// Tests migrating FS format without .minio.sys/buckets.
+func TestFSMigrateObjectWithoutObjects(t *testing.T) {
 	// Prepare for testing
 	disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
 	defer removeAll(disk)
@@ -100,13 +102,364 @@ func TestFSLoadFormatFS(t *testing.T) {
 	}

 	fsFormatPath := pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
-	if err := saveFormatFS(preparePath(fsFormatPath), newFSFormatV1()); err != nil {
-		t.Fatal("Should not fail here", err)
+	formatCfg := &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "1",
+		},
 	}
-	_, err := loadFormatFS(disk)
+
+	lk, err := lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
 	if err != nil {
 		t.Fatal("Should not fail here", err)
 	}
+
+	if err = initFormatFS(disk, uuid); err != nil {
+		t.Fatal("Should not fail with unexpected", err)
+	}
+
+	formatCfg = &formatConfigV1{}
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDONLY, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.ReadFrom(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+	if formatCfg.FS.Version != fsFormatV2 {
+		t.Fatalf("Unexpected version detected expected \"%s\", got %s", fsFormatV2, formatCfg.FS.Version)
+	}
+}
+
+// Tests migrating FS format without .minio.sys/buckets.
+func TestFSMigrateObjectWithErr(t *testing.T) {
+	// Prepare for testing
+	disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
+	defer removeAll(disk)
+
+	// Assign a new UUID.
+	uuid := mustGetUUID()
+
+	// Initialize meta volume, if volume already exists ignores it.
+	if err := initMetaVolumeFS(disk, uuid); err != nil {
+		t.Fatal(err)
+	}
+
+	fsFormatPath := pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
+	formatCfg := &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "10",
+		},
+	}
+
+	lk, err := lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+
+	if err = initFormatFS(disk, uuid); err != nil {
+		if errorCause(err).Error() !=
+			"Unable to validate 'format.json', corrupted backend format" {
+			t.Fatal("Should not fail with unexpected", err)
+		}
+	}
+
+	fsFormatPath = pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
+	formatCfg = &formatConfigV1{
+		Version: "1",
+		Format:  "garbage",
+		FS: &fsFormat{
+			Version: "1",
+		},
+	}
+
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+
+	if err = initFormatFS(disk, uuid); err != nil {
+		if errorCause(err).Error() !=
+			"Unable to validate 'format.json', Unable to recognize backend format, Disk is not in FS format. garbage" {
+			t.Fatal("Should not fail with unexpected", err)
+		}
+	}
+
+}
+
+// Tests migrating FS format with .minio.sys/buckets filled with
+// object metadata.
+func TestFSMigrateObjectWithObjects(t *testing.T) {
+	// Prepare for testing
+	disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
+	defer removeAll(disk)
+
+	// Assign a new UUID.
+	uuid := mustGetUUID()
+
+	// Initialize meta volume, if volume already exists ignores it.
+	if err := initMetaVolumeFS(disk, uuid); err != nil {
+		t.Fatal(err)
+	}
+
+	fsFormatPath := pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
+	formatCfg := &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "1",
+		},
+	}
+	lk, err := lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+
+	// Construct the full path of fs.json
+	fsPath1 := pathJoin(bucketMetaPrefix, "testvolume1", "my-object1", fsMetaJSONFile)
+	fsPath1 = pathJoin(disk, minioMetaBucket, fsPath1)
+
+	fsMetaJSON := `{"version":"1.0.0","format":"fs","minio":{"release":"DEVELOPMENT.2017-03-27T02-26-33Z"},"meta":{"md5Sum":"467886be95c8ecfd71a2900e3f461b4f"}`
+	if _, err = fsCreateFile(fsPath1, bytes.NewReader([]byte(fsMetaJSON)), nil, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	// Construct the full path of fs.json
+	fsPath2 := pathJoin(bucketMetaPrefix, "testvolume2", "my-object2", fsMetaJSONFile)
+	fsPath2 = pathJoin(disk, minioMetaBucket, fsPath2)
+
+	fsMetaJSON = `{"version":"1.0.0","format":"fs","minio":{"release":"DEVELOPMENT.2017-03-27T02-26-33Z"},"meta":{"md5Sum":"467886be95c8ecfd71a2900eff461b4d"}`
+	if _, err = fsCreateFile(fsPath2, bytes.NewReader([]byte(fsMetaJSON)), nil, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	// Construct the full path of policy.json
+	ppath := pathJoin(bucketMetaPrefix, "testvolume2", bucketPolicyConfig)
+	ppath = pathJoin(disk, minioMetaBucket, ppath)
+
+	policyJSON := `{"Version":"2012-10-17","Statement":[{"Action":["s3:GetBucketLocation","s3:ListBucket"],"Effect":"Allow","Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::testbucket"],"Sid":""},{"Action":["s3:GetObject"],"Effect":"Allow","Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::testbucket/*"],"Sid":""}]}`
+	if _, err = fsCreateFile(ppath, bytes.NewReader([]byte(policyJSON)), nil, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	if err = initFormatFS(disk, mustGetUUID()); err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+
+	fsPath2 = pathJoin(bucketMetaPrefix, "testvolume2", objectMetaPrefix, "my-object2", fsMetaJSONFile)
+	fsPath2 = pathJoin(disk, minioMetaBucket, fsPath2)
+	fi, err := fsStatFile(fsPath2)
+	if err != nil {
+		t.Fatal("Path should exist and accessible after migration", err)
+	}
+	if fi.IsDir() {
+		t.Fatalf("Unexpected path %s should be a file", fsPath2)
+	}
+
+	formatCfg = &formatConfigV1{}
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDONLY, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.ReadFrom(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal("Should not fail here", err)
+	}
+	if formatCfg.FS.Version != fsFormatV2 {
+		t.Fatalf("Unexpected version detected expected \"%s\", got %s", fsFormatV2, formatCfg.FS.Version)
+	}
+
+	ppath = pathJoin(bucketMetaPrefix, "testvolume2", "acl.json")
+	ppath = pathJoin(disk, minioMetaBucket, ppath)
+
+	if _, err = fsCreateFile(ppath, bytes.NewReader([]byte("")), nil, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	if err = initFormatFS(disk, mustGetUUID()); errorCause(err) != errCorruptedFormat {
+		t.Fatal("Should not fail here", err)
+	}
+}
+
+// TestFSCheckFormatFSErr - test loadFormatFS loading older format.
+func TestFSCheckFormatFSErr(t *testing.T) {
+	// Prepare for testing
+	disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
+	defer removeAll(disk)
+
+	// Assign a new UUID.
+	uuid := mustGetUUID()
+
+	// Initialize meta volume, if volume already exists ignores it.
+	if err := initMetaVolumeFS(disk, uuid); err != nil {
+		t.Fatal(err)
+	}
+
+	fsFormatPath := pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
+	formatCfg := &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "1",
+		},
+	}
+
+	lk, err := lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	formatCfg = &formatConfigV1{}
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = formatCfg.ReadFrom(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = checkFormatFS(formatCfg, fsFormatVersion); errorCause(err) != errFSFormatOld {
+		t.Fatal("Should not fail with unexpected", err)
+	}
+
+	formatCfg = &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "10",
+		},
+	}
+
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = checkFormatFS(formatCfg, fsFormatVersion); errorCause(err) != errCorruptedFormat {
+		t.Fatal("Should not fail with unexpected", err)
+	}
+
+	formatCfg = &formatConfigV1{
+		Version: "1",
+		Format:  "garbage",
+		FS: &fsFormat{
+			Version: "1",
+		},
+	}
+
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = checkFormatFS(formatCfg, fsFormatVersion); err != nil {
+		if errorCause(err).Error() != "Unable to recognize backend format, Disk is not in FS format. garbage" {
+			t.Fatal("Should not fail with unexpected", err)
+		}
+	}
+
+	if err = checkFormatFS(nil, fsFormatVersion); errorCause(err) != errUnexpected {
+		t.Fatal("Should fail with errUnexpected, but found", err)
+	}
+
+	formatCfg = &formatConfigV1{
+		Version: "1",
+		Format:  "fs",
+		FS: &fsFormat{
+			Version: "2",
+		},
+	}
+
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = formatCfg.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Should not fail.
+	if err = checkFormatFS(formatCfg, fsFormatVersion); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// TestFSCheckFormatFS - test loadFormatFS with healty and faulty disks
+func TestFSCheckFormatFS(t *testing.T) {
+	// Prepare for testing
+	disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
+	defer removeAll(disk)
+
+	// Assign a new UUID.
+	uuid := mustGetUUID()
+
+	// Initialize meta volume, if volume already exists ignores it.
+	if err := initMetaVolumeFS(disk, uuid); err != nil {
+		t.Fatal(err)
+	}
+
+	fsFormatPath := pathJoin(disk, minioMetaBucket, fsFormatJSONFile)
+	lk, err := lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	format := newFSFormatV2()
+	_, err = format.WriteTo(lk)
+	lk.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	// Loading corrupted format file
 	file, err := os.OpenFile(preparePath(fsFormatPath), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
@@ -114,15 +467,24 @@ func TestFSLoadFormatFS(t *testing.T) {
 	}
 	file.Write([]byte{'b'})
 	file.Close()
-	_, err = loadFormatFS(disk)
+
+	lk, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDWR|os.O_CREATE, 0600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	format = &formatConfigV1{}
+	_, err = format.ReadFrom(lk)
+	lk.Close()
 	if err == nil {
 		t.Fatal("Should return an error here")
 	}
+
 	// Loading format file from disk not found.
 	removeAll(disk)
-	_, err = loadFormatFS(disk)
-	if err != nil && err != errUnformattedDisk {
-		t.Fatal("Should return unformatted disk, but got", err)
+	_, err = lock.LockedOpenFile(preparePath(fsFormatPath), os.O_RDONLY, 0600)
+	if err != nil && !os.IsNotExist(err) {
+		t.Fatal("Should return 'format.json' does not exist, but got", err)
 	}
 }