Merge pull request #4965 from kobergj/MaxAcuireLockCycles

Max AcquireLock Cycles and Bump Reva

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

@@ -95,7 +95,8 @@ type OCISDriver struct {
 	// the general space alias, eg: `{{.SpaceType}}/{{.SpaceName | replace " " "-" | lower}}`
 	GeneralSpaceAliasTemplate string `yaml:"generalspacealias_template" env:"STORAGE_USERS_OCIS_GENERAL_SPACE_ALIAS_TEMPLATE" desc:"Template string to construct general space aliases."`
 	//ShareFolder defines the name of the folder jailing all shares
-	ShareFolder string `yaml:"share_folder" env:"STORAGE_USERS_OCIS_SHARE_FOLDER" desc:"Name of the folder jailing all shares."`
+	ShareFolder          string `yaml:"share_folder" env:"STORAGE_USERS_OCIS_SHARE_FOLDER" desc:"Name of the folder jailing all shares."`
+	MaxAcquireLockCycles int    `yaml:"max_acquire_lock_cycles" env:"STORAGE_USERS_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 25 will be used"`
 }
 
 type S3NGDriver struct {

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

@@ -71,6 +71,7 @@ func DefaultConfig() *config.Config {
 				PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}",
 				GeneralSpaceAliasTemplate:  "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
 				PermissionsEndpoint:        "127.0.0.1:9191",
+				MaxAcquireLockCycles:       25,
 			},
 		},
 		Events: config.Events{

services/storage-users/pkg/revaconfig/user.go

@@ -96,6 +96,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 			"treesize_accounting":         true,
 			"permissionssvc":              cfg.Drivers.OCIS.PermissionsEndpoint,
 			"permissionssvc_tls_mode":     cfg.Commons.GRPCClientTLS.Mode,
+			"max_acquire_lock_cycles":     cfg.Drivers.OCIS.MaxAcquireLockCycles,
 		},
 		"s3": map[string]interface{}{
 			"enable_home": false,
@@ -121,6 +122,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 			"s3.secret_key":               cfg.Drivers.S3NG.SecretKey,
 			"s3.endpoint":                 cfg.Drivers.S3NG.Endpoint,
 			"s3.bucket":                   cfg.Drivers.S3NG.Bucket,
+			"max_acquire_lock_cycles":     cfg.Drivers.OCIS.MaxAcquireLockCycles,
 		},
 	}
 }