decomposedfs increase filelock duration factor

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

services/storage-system/pkg/config/config.go

@@ -75,4 +75,7 @@ type Drivers struct {
 type OCISDriver struct {
 	// Root is the absolute path to the location of the data
 	Root string `yaml:"root" env:"STORAGE_SYSTEM_OCIS_ROOT" desc:"Path for the directory where the STORAGE-SYSTEM service stores it's persistent data."`
+
+	MaxAcquireLockCycles    int `yaml:"max_acquire_lock_cycles" env:"STORAGE_SYSTEM_OCIS_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, ocis will try this amount of times to acquire the lock before failing. After each try it will wait for an increasing amount of time. Values of 0 or below will be ignored and the default value of 20 will be used."`
+	LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_SYSTEM_OCIS_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, ocis will multiply the cycle with this factor and use it as a millisecond timeout. Values of 0 or below will be ignored and the default value of 30 will be used."`
 }

services/storage-system/pkg/config/defaults/defaultconfig.go

@@ -41,7 +41,9 @@ func DefaultConfig() *config.Config {
 		Driver:        "ocis",
 		Drivers: config.Drivers{
 			OCIS: config.OCISDriver{
-				Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
+				Root:                    filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
+				MaxAcquireLockCycles:    20,
+				LockCycleDurationFactor: 30,
 			},
 		},
 	}

services/storage-system/pkg/revaconfig/config.go

@@ -153,11 +153,13 @@ func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} {
 func metadataDrivers(cfg *config.Config) map[string]interface{} {
 	return map[string]interface{}{
 		"ocis": map[string]interface{}{
-			"root":                cfg.Drivers.OCIS.Root,
-			"user_layout":         "{{.Id.OpaqueId}}",
-			"treetime_accounting": false,
-			"treesize_accounting": false,
-			"permissionssvc":      cfg.GRPC.Addr,
+			"root":                       cfg.Drivers.OCIS.Root,
+			"user_layout":                "{{.Id.OpaqueId}}",
+			"treetime_accounting":        false,
+			"treesize_accounting":        false,
+			"permissionssvc":             cfg.GRPC.Addr,
+			"max_acquire_lock_cycles":    cfg.Drivers.OCIS.MaxAcquireLockCycles,
+			"lock_cycle_duration_factor": cfg.Drivers.OCIS.LockCycleDurationFactor,
 		},
 	}
 }