update mergerfs

Author: LinkLeong

api/local_storage/openapi.yaml

@@ -486,7 +486,7 @@ components:
           example: "/mnt/a:/mnt/b"
         options:
           type: string
-          example: "defaults,allow_other,use_ino,category.create=mfs,moveonenospc=true,minfreespace=1M"
+          example: "defaults,allow_other,category.create=mfs,moveonenospc=true,minfreespace=1M"
         extended:
           type: object
           description: |-

build/sysroot/usr/local/bin/mergerfs.ctl

@@ -66,7 +66,7 @@ def control_file(path):
 
 
 def add_srcmount(ctrlfile,srcmount):
-    key   = b'user.mergerfs.srcmounts'
+    key   = b'user.mergerfs.branches'
     value = b'+' + srcmount.encode()
     try:
         os.setxattr(ctrlfile,key,value)
@@ -75,7 +75,7 @@ def add_srcmount(ctrlfile,srcmount):
 
 
 def remove_srcmount(ctrlfile,srcmount):
-    key   = b'user.mergerfs.srcmounts'
+    key   = b'user.mergerfs.branches'
     value = b'-' + srcmount.encode()
     try:
         os.setxattr(ctrlfile,key,value)

pkg/fstab/fstab_test.go

@@ -10,7 +10,7 @@ import (
 const fstabContent = `
 	# UNCONFIGURED FSTAB FOR BASE SYSTEM
 	LABEL=UEFI      /boot/efi       vfat    umask=0077      0 1
-	/mnt/sdb:/mnt/sdc       /media  mergerfs        defaults,allow_other,use_ino,category.create=mfs,moveonenospc=true,minfreespace=1M 0 0
+	/mnt/sdb:/mnt/sdc       /media  mergerfs        defaults,allow_other,category.create=mfs,moveonenospc=true,minfreespace=1M 0 0
 	LABEL=desktop-rootfs    /               ext4    defaults        0 1
 `
 
@@ -31,7 +31,7 @@ func TestFSTab(t *testing.T) {
 	assert.Equal(t, entry.Source, "/mnt/sdb:/mnt/sdc")
 	assert.Equal(t, entry.MountPoint, "/media")
 	assert.Equal(t, entry.FSType, "mergerfs")
-	assert.Equal(t, entry.Options, "defaults,allow_other,use_ino,category.create=mfs,moveonenospc=true,minfreespace=1M")
+	assert.Equal(t, entry.Options, "defaults,allow_other,category.create=mfs,moveonenospc=true,minfreespace=1M")
 	assert.Equal(t, entry.Dump, 0)
 	assert.Equal(t, entry.Pass, PassDoNotCheck)
 
@@ -51,7 +51,7 @@ func TestFSTab(t *testing.T) {
 	assert.Equal(t, entry.Source, "/mnt/sdb:/mnt/sdc")
 	assert.Equal(t, entry.MountPoint, "/media")
 	assert.Equal(t, entry.FSType, "mergerfs")
-	assert.Equal(t, entry.Options, "defaults,allow_other,use_ino,category.create=mfs,moveonenospc=true,minfreespace=1M")
+	assert.Equal(t, entry.Options, "defaults,allow_other,category.create=mfs,moveonenospc=true,minfreespace=1M")
 	assert.Equal(t, entry.Dump, 0)
 	assert.Equal(t, entry.Pass, PassDoNotCheck)
 }

pkg/mergerfs/mergerfs.go

@@ -46,7 +46,7 @@ func ListValues(fspath string) (map[string]string, error) {
 func SetSource(fspath string, sources []string) error {
 	ctrlfile := ControlFile(fspath)
 
-	key := "user.mergerfs.srcmounts"
+	key := "user.mergerfs.branches"
 
 	sourceMap := make(map[string]interface{})
 	for _, source := range sources {
@@ -59,8 +59,9 @@ func SetSource(fspath string, sources []string) error {
 	}
 
 	value := []byte(strings.Join(dedupedSources, ":"))
-	logger.Error("SetSource", zap.String("key", key), zap.String("value", string(value)), zap.String("ctrlfile", ctrlfile))
+	//str, err := command.ExecResultStr("setfattr -n " + key + " -v " + string(string(value)) + " " + ctrlfile)
 	err := syscall.Setxattr(ctrlfile, key, value, 0)
+	//logger.Error("SetSourceStr", zap.String("str", str))
 	if err != nil {
 		logger.Error("SetSource", zap.Error(err))
 		return err
@@ -80,7 +81,7 @@ func GetSource(fspath string) ([]string, error) {
 func AddSource(fspath string, source string) error {
 	ctrlfile := ControlFile(fspath)
 
-	key := "user.mergerfs.srcmounts"
+	key := "user.mergerfs.branches"
 	value := []byte("+" + source)
 
 	return syscall.Setxattr(ctrlfile, key, value, 0)
@@ -89,7 +90,7 @@ func AddSource(fspath string, source string) error {
 func RemoveSource(fspath string, source string) error {
 	ctrlfile := ControlFile(fspath)
 
-	key := "user.mergerfs.srcmounts"
+	key := "user.mergerfs.branches"
 	value := []byte("-" + source)
 
 	return syscall.Setxattr(ctrlfile, key, value, 0)

route/v2/merge.go

@@ -55,7 +55,6 @@ func (s *LocalStorage) SetMerge(ctx echo.Context) error {
 	if m.Fstype != nil {
 		fstype = *m.Fstype
 	}
-	logger.Info("fstype", zap.String("fstype", fstype))
 	// expand source volume paths to source volumes
 	var sourceVolumes []*model2.Volume
 	if m.SourceVolumeUuids != nil {

service/disk.go

@@ -94,6 +94,7 @@ func (d *diskService) EnsureDefaultMergePoint() bool {
 		if len(existingMerges) > 1 {
 			logger.Error("more than one merge point with the same mount point found", zap.String("mount point", mountPoint))
 		}
+		config.ServerInfo.EnableMergerFS = "true"
 		return true
 	}
 
@@ -111,6 +112,7 @@ func (d *diskService) EnsureDefaultMergePoint() bool {
 	isExist := false
 	for _, v := range mounts {
 		if v.MountPoint == mountPoint {
+			config.ServerInfo.EnableMergerFS = "true"
 			isExist = true
 			merge.SourceBasePath = v.Source
 			break
@@ -133,7 +135,7 @@ func (d *diskService) EnsureDefaultMergePoint() bool {
 	if err := MyService.LocalStorage().CreateMergeInDB(merge); err != nil {
 		panic(err)
 	}
-
+	config.ServerInfo.EnableMergerFS = "true"
 	return true
 }
 func (d *diskService) RemoveLSBLKCache() {
@@ -163,18 +165,18 @@ func (d *diskService) SmartCTL(path string) model.SmartctlA {
 	buf := command.ExecSmartCTLByPath(path)
 	if buf == nil {
 		if err := Cache.Add(key, m, time.Minute*10); err != nil {
-			logger.Error("failed to add cache", zap.Error(err), zap.String("key", key))
+			//logger.Error("failed to add cache", zap.Error(err), zap.String("key", key))
 		}
 		return m
 	}
 
 	err := json2.Unmarshal(buf, &m)
 	if err != nil {
-		logger.Error("failed to unmarshal json", zap.Error(err), zap.String("json", string(buf)))
+		//logger.Error("failed to unmarshal json", zap.Error(err), zap.String("json", string(buf)))
 	}
 	if !reflect.DeepEqual(m, model.SmartctlA{}) {
 		if err := Cache.Add(key, m, time.Hour*24); err != nil {
-			logger.Error("failed to add cache", zap.Error(err), zap.String("key", key))
+			//logger.Error("failed to add cache", zap.Error(err), zap.String("key", key))
 		}
 	}
 	return m

service/v2/fs/mergerfs.go

@@ -9,7 +9,7 @@ import (
 const (
 	MergerFS               = "mergerfs"
 	MergerFSFullName       = "fuse.mergerfs"
-	MergerFSDefaultOptions = "defaults,allow_other,use_ino,category.create=mfs,moveonenospc=true,minfreespace=1M"
+	MergerFSDefaultOptions = "category.create=mfs,moveonenospc=true,minfreespace=1M"
 
 	MergerFSExtendedKeySource = "mergerfs.src" // corresponding value could be for example: /var/lib/casaos/files