From ffb2df3b759f65cb8df8c4f409b611adc70d04b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 17 Jan 2025 11:43:55 +0100 Subject: [PATCH 1/3] Rebrand storage-shares --- services/storage-shares/pkg/command/root.go | 2 +- services/storage-shares/pkg/revaconfig/config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/storage-shares/pkg/command/root.go b/services/storage-shares/pkg/command/root.go index ffe564b3c..fca2176a7 100644 --- a/services/storage-shares/pkg/command/root.go +++ b/services/storage-shares/pkg/command/root.go @@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) cli.Commands { func Execute(cfg *config.Config) error { app := clihelper.DefaultApp(&cli.App{ Name: "storage-shares", - Usage: "Provide a virtual storage for shares in oCIS", + Usage: "Provide a virtual storage for shares in OpenCloud", Commands: GetCommands(cfg), }) diff --git a/services/storage-shares/pkg/revaconfig/config.go b/services/storage-shares/pkg/revaconfig/config.go index cb4ee87cf..1e277a382 100644 --- a/services/storage-shares/pkg/revaconfig/config.go +++ b/services/storage-shares/pkg/revaconfig/config.go @@ -5,7 +5,7 @@ import ( "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" ) -// StorageSharesConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. +// StorageSharesConfigFromStruct will adapt an OpenCloud config struct into a reva mapstructure to start a reva service. func StorageSharesConfigFromStruct(cfg *config.Config) map[string]interface{} { rcfg := map[string]interface{}{ "shared": map[string]interface{}{ From 374ad3990029ea0ae17cc5da1fb1eee3a58b52b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 17 Jan 2025 11:44:07 +0100 Subject: [PATCH 2/3] Rebrand storage-system --- services/storage-system/README.md | 2 +- services/storage-system/pkg/command/root.go | 2 +- services/storage-system/pkg/config/config.go | 6 +++--- services/storage-system/pkg/revaconfig/config.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/storage-system/README.md b/services/storage-system/README.md index 1ab9c0103..3fce3ce90 100644 --- a/services/storage-system/README.md +++ b/services/storage-system/README.md @@ -1,6 +1,6 @@ # Storage-System -The Infinite Scale Storage-System service persists and caches user related data that is defined via Infinite Scale. This can be among other data role assignments, user settings and users shares. +The OpenCloud Storage-System service persists and caches user related data that is defined via OpenCloud. This can be among other data role assignments, user settings and users shares. ## Caching diff --git a/services/storage-system/pkg/command/root.go b/services/storage-system/pkg/command/root.go index a9587dec1..9e69d0cae 100644 --- a/services/storage-system/pkg/command/root.go +++ b/services/storage-system/pkg/command/root.go @@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) cli.Commands { func Execute(cfg *config.Config) error { app := clihelper.DefaultApp(&cli.App{ Name: "storage-system", - Usage: "Provide system storage for oCIS", + Usage: "Provide system storage for OpenCloud", Commands: GetCommands(cfg), }) diff --git a/services/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go index f2c69ea55..b599f80c8 100644 --- a/services/storage-system/pkg/config/config.go +++ b/services/storage-system/pkg/config/config.go @@ -21,7 +21,7 @@ type Config struct { TokenManager *TokenManager `yaml:"token_manager"` Reva *shared.Reva `yaml:"reva"` - SystemUserID string `yaml:"system_user_id" env:"OC_SYSTEM_USER_ID" desc:"ID of the oCIS storage-system system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format." introductionVersion:"pre5.0"` + SystemUserID string `yaml:"system_user_id" env:"OC_SYSTEM_USER_ID" desc:"ID of the OpenCloud storage-system system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format." introductionVersion:"pre5.0"` SystemUserAPIKey string `yaml:"system_user_api_key" env:"OC_SYSTEM_USER_API_KEY" desc:"API key for the STORAGE-SYSTEM system user." introductionVersion:"pre5.0"` SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"STORAGE_SYSTEM_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the loading of user's group memberships from the reva access token." introductionVersion:"pre5.0"` @@ -80,8 +80,8 @@ type OCISDriver struct { // Root is the absolute path to the location of the data Root string `yaml:"root" env:"STORAGE_SYSTEM_OC_ROOT" desc:"Path for the directory where the STORAGE-SYSTEM service stores it's persistent data. If not defined, the root directory derives from $OC_BASE_DATA_PATH/storage." introductionVersion:"pre5.0"` - MaxAcquireLockCycles int `yaml:"max_acquire_lock_cycles" env:"STORAGE_SYSTEM_OC_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." introductionVersion:"pre5.0"` - LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_SYSTEM_OC_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." introductionVersion:"pre5.0"` + MaxAcquireLockCycles int `yaml:"max_acquire_lock_cycles" env:"STORAGE_SYSTEM_OC_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, OpenCloud 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." introductionVersion:"pre5.0"` + LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_SYSTEM_OC_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, OpenCloud 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." introductionVersion:"pre5.0"` } // Cache holds cache config diff --git a/services/storage-system/pkg/revaconfig/config.go b/services/storage-system/pkg/revaconfig/config.go index 95c5300c2..c19023c0c 100644 --- a/services/storage-system/pkg/revaconfig/config.go +++ b/services/storage-system/pkg/revaconfig/config.go @@ -6,7 +6,7 @@ import ( "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" ) -// StorageSystemFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. +// StorageSystemFromStruct will adapt an OpenCloud config struct into a reva mapstructure to start a reva service. func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} { localEndpoint := pkgconfig.LocalEndpoint(cfg.GRPC.Protocol, cfg.GRPC.Addr) From 2b9e1935842a2e2614b85c896ab4933780627986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 17 Jan 2025 11:44:18 +0100 Subject: [PATCH 3/3] Rebrand storage-users --- services/storage-users/README.md | 44 +++++++++---------- services/storage-users/pkg/command/root.go | 4 +- services/storage-users/pkg/config/config.go | 14 +++--- .../storage-users/pkg/revaconfig/config.go | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/services/storage-users/README.md b/services/storage-users/README.md index b1b8236a0..5abcaf6d2 100644 --- a/services/storage-users/README.md +++ b/services/storage-users/README.md @@ -4,15 +4,15 @@ Purpose and description to be added ## Graceful Shutdown -Starting with Infinite Scale version 3.1, you can define a graceful shutdown period for the `storage-users` service. +You can define a graceful shutdown period for the `storage-users` service. IMPORTANT: The graceful shutdown period is only applicable if the `storage-users` service runs as standalone service. It does not apply if the `storage-users` service runs as part of the single binary or as single Docker environment. To build an environment where the `storage-users` service runs as a standalone service, you must start two instances, one _without_ the `storage-users` service and one _only with_ the the `storage-users` service. Note that both instances must be able to communicate on the same network. -When hard-stopping Infinite Scale, for example with the `kill ` command (SIGKILL), it is possible and likely that not all data from the decomposedfs (metadata) has been written to the storage which may result in an inconsistent decomposedfs. When gracefully shutting down Infinite Scale, using a command like SIGTERM, the process will no longer accept any write requests from _other_ services and will try to write the internal open requests which can take an undefined duration based on many factors. To mitigate that situation, the following things have been implemented: +When hard-stopping OpenCloud, for example with the `kill ` command (SIGKILL), it is possible and likely that not all data from the decomposedfs (metadata) has been written to the storage which may result in an inconsistent decomposedfs. When gracefully shutting down OpenCloud, using a command like SIGTERM, the process will no longer accept any write requests from _other_ services and will try to write the internal open requests which can take an undefined duration based on many factors. To mitigate that situation, the following things have been implemented: * With the value of the environment variable `STORAGE_USERS_GRACEFUL_SHUTDOWN_TIMEOUT`, the `storage-users` service will delay its shutdown giving it time to finalize writing necessary data. This delay can be necessary if there is a lot of data to be saved and/or if storage access/thruput is slow. In such a case you would receive an error log entry informing you that not all data could be saved in time. To prevent such occurrences, you must increase the default value. -* If a shutdown error has been logged, the command-line maintenance tool [Inspect and Manipulate Node Metadata](https://doc.owncloud.com/ocis/next/maintenance/commands/commands.html#inspect-and-manipulate-node-metadata) can help to fix the issue. Please contact support for details. +* If a shutdown error has been logged, the command-line maintenance tool [Inspect and Manipulate Node Metadata](https://doc.opencloud.eu/maintenance/commands/commands.html#inspect-and-manipulate-node-metadata) can help to fix the issue. Please contact support for details. ## CLI Commands @@ -29,7 +29,7 @@ The `storage-users` CLI tool uses the default address to establish the connectio -When using Infinite Scale as user storage, a directory named `storage/users/uploads` can be found in the Infinite Scale data folder. This is an intermediate directory based on [TUS](https://tus.io) which is an open protocol for resumable uploads. Each upload consists of a _blob_ and a _blob.info_ file. Note that the term _blob_ is just a placeholder. +When using OpenCloud as user storage, a directory named `storage/users/uploads` can be found in the OpenCloud data folder. This is an intermediate directory based on [TUS](https://tus.io) which is an open protocol for resumable uploads. Each upload consists of a _blob_ and a _blob.info_ file. Note that the term _blob_ is just a placeholder. * **If an upload succeeds**, the _blob_ file will be moved to the target and the _blob.info_ file will be deleted. @@ -50,7 +50,7 @@ Example cases for expired uploads: The following commands are available to manage unfinished uploads: ```bash -ocis storage-users uploads +opencloud storage-users uploads ``` ```plaintext @@ -71,15 +71,15 @@ The `sessions` command is the entry point for listing, restarting and cleaning u > When resuming an upload, processing will continue unfinished items from their last completed step. ```bash -ocis storage-users uploads sessions +opencloud storage-users uploads sessions ``` ``` NAME: - ocis storage-users uploads sessions - Print a list of upload sessions + opencloud storage-users uploads sessions - Print a list of upload sessions USAGE: - ocis storage-users uploads sessions [command options] + opencloud storage-users uploads sessions [command options] OPTIONS: --id value filter sessions by upload session id (default: unset) @@ -105,7 +105,7 @@ Some additional information on returned information: Command to list ongoing upload sessions ```bash -ocis storage-users uploads sessions --expired=false --processing=false +opencloud storage-users uploads sessions --expired=false --processing=false ``` ```plaintext @@ -121,12 +121,12 @@ Not expired sessions: The sessions command can also output json ```bash -ocis storage-users uploads sessions --expired=false --processing=false --json +opencloud storage-users uploads sessions --expired=false --processing=false --json ``` ```json -{"id":"5e387954-7313-4223-a904-bf996da6ec0b","space":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","filename":"foo.txt","offset":0,"size":1234,"executant":{"idp":"https://cloud.ocis.test","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"spaceowner":{"opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"expires":"2024-01-26T13:04:31+01:00","processing":false, "scanDate": "2024-04-24T11:24:14+02:00", "scanResult": "infected: virus A"} -{"id":"f066244d-97b2-48e7-a30d-b40fcb60cec6","space":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","filename":"bar.txt","offset":0,"size":4321,"executant":{"idp":"https://cloud.ocis.test","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"spaceowner":{"opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"expires":"2024-01-26T13:18:47+01:00","processing":false, "scanDate": "2024-04-24T14:38:29+02:00", "scanResult": ""} +{"id":"5e387954-7313-4223-a904-bf996da6ec0b","space":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","filename":"foo.txt","offset":0,"size":1234,"executant":{"idp":"https://cloud.opencloud.test","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"spaceowner":{"opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"expires":"2024-01-26T13:04:31+01:00","processing":false, "scanDate": "2024-04-24T11:24:14+02:00", "scanResult": "infected: virus A"} +{"id":"f066244d-97b2-48e7-a30d-b40fcb60cec6","space":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c","filename":"bar.txt","offset":0,"size":4321,"executant":{"idp":"https://cloud.opencloud.test","opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"spaceowner":{"opaque_id":"f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"},"expires":"2024-01-26T13:18:47+01:00","processing":false, "scanDate": "2024-04-24T14:38:29+02:00", "scanResult": ""} ``` The sessions command can also clear and restart/resume uploads. The output is the same as if run without `--clean` or `--restart` flag. @@ -134,19 +134,19 @@ Note: It is recommended to run to command first without the `--clean` (`--proces ```bash # cleans all expired uploads regardless of processing and virus state. -ocis storage-users uploads sessions --expired=true --clean +opencloud storage-users uploads sessions --expired=true --clean # resumes all uploads that are processing and are not virus infected -ocis storage-users uploads sessions --processing=false --has-virus=false --resume +opencloud storage-users uploads sessions --processing=false --has-virus=false --resume ``` ### Manage Trash-Bin Items This command set provides commands to get an overview of trash-bin items, restore items and purge old items of `personal` spaces and `project` spaces (spaces that have been created manually). `trash-bin` commands require a `spaceID` as parameter. See [List all spaces -](https://owncloud.dev/apis/http/graph/spaces/#list-all-spaces-get-drives) or [Listing Space IDs](https://doc.owncloud.com/ocis/5.0/maintenance/space-ids/space-ids.html) for details of how to get them. +](https://doc.opencloud.eu/apis/http/graph/spaces/#list-all-spaces-get-drives) or [Listing Space IDs](https://doc.opencloud.eu/maintenance/space-ids/space-ids.html) for details of how to get them. ```bash -ocis storage-users trash-bin +opencloud storage-users trash-bin ``` ```plaintext @@ -161,7 +161,7 @@ COMMANDS: * Purge all expired items from the trash-bin. ```bash - ocis storage-users trash-bin purge-expired + opencloud storage-users trash-bin purge-expired ``` The behaviour of the `purge-expired` command can be configured by using the following environment variables. @@ -170,10 +170,10 @@ The behaviour of the `purge-expired` command can be configured by using the foll Used to obtain space trash-bin information and takes the system admin user as the default which is the `OC_ADMIN_USER_ID` but can be set individually. It should be noted, that the `OC_ADMIN_USER_ID` is only assigned automatically when using the single binary deployment and must be manually assigned in all other deployments. The command only considers spaces to which the assigned user has access and delete permission. * `STORAGE_USERS_PURGE_TRASH_BIN_PERSONAL_DELETE_BEFORE`\ -Has a default value of `720h` which equals `30 days`. This means, the command will delete all files older than `30 days`. The value is human-readable, for valid values see the duration type described in the [Environment Variable Types](https://doc.owncloud.com/ocis/latest/deployment/services/envvar-types-description.html). A value of `0` is equivalent to disable and prevents the deletion of `personal space` trash-bin files. +Has a default value of `720h` which equals `30 days`. This means, the command will delete all files older than `30 days`. The value is human-readable, for valid values see the duration type described in the [Environment Variable Types](https://doc.opencloud.eu/deployment/services/envvar-types-description.html). A value of `0` is equivalent to disable and prevents the deletion of `personal space` trash-bin files. * `STORAGE_USERS_PURGE_TRASH_BIN_PROJECT_DELETE_BEFORE`\ -Has a default value of `720h` which equals `30 days`. This means, the command will delete all files older than `30 days`. The value is human-readable, for valid values see the duration type described in the [Environment Variable Types](https://doc.owncloud.com/ocis/latest/deployment/services/envvar-types-description.html). A value of `0` is equivalent to disable and prevents the deletion of `project space` trash-bin files. +Has a default value of `720h` which equals `30 days`. This means, the command will delete all files older than `30 days`. The value is human-readable, for valid values see the duration type described in the [Environment Variable Types](https://doc.opencloud.eu/latest/deployment/services/envvar-types-description.html). A value of `0` is equivalent to disable and prevents the deletion of `project space` trash-bin files. #### List and Restore Trash-Bins Items @@ -193,7 +193,7 @@ The `storage-users` CLI tool uses the default address to establish the connectio * Print a list of all trash-bin items of a space ```bash - ocis storage-users trash-bin list [command options] ['spaceID' required] + opencloud storage-users trash-bin list [command options] ['spaceID' required] ``` The restore option defines the behavior for an item to be restored, when the item name already exists in the target space. Supported options are: `skip`, `replace` and `keep-both`. The default value is `skip`. @@ -202,12 +202,12 @@ When the CLI tool restores the item with the `replace` option, the existing item * Restore all trash-bin items for a space ```bash - ocis storage-users trash-bin restore-all [command options] ['spaceID' required] + opencloud storage-users trash-bin restore-all [command options] ['spaceID' required] ``` * Restore a trash-bin item by ID ```bash - ocis storage-users trash-bin restore [command options] ['spaceID' required] ['itemID' required] + opencloud storage-users trash-bin restore [command options] ['spaceID' required] ['itemID' required] ``` ## Caching diff --git a/services/storage-users/pkg/command/root.go b/services/storage-users/pkg/command/root.go index 8c879e59d..c49a510a7 100644 --- a/services/storage-users/pkg/command/root.go +++ b/services/storage-users/pkg/command/root.go @@ -24,11 +24,11 @@ func GetCommands(cfg *config.Config) cli.Commands { } } -// Execute is the entry point for the ocis-storage-users command. +// Execute is the entry point for the opencloud-storage-users command. func Execute(cfg *config.Config) error { app := clihelper.DefaultApp(&cli.App{ Name: "storage-users", - Usage: "Provide storage for users and projects in oCIS", + Usage: "Provide storage for users and projects in OpenCloud", Commands: GetCommands(cfg), }) diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go index bff1fb94e..33935318c 100644 --- a/services/storage-users/pkg/config/config.go +++ b/services/storage-users/pkg/config/config.go @@ -103,9 +103,9 @@ type Drivers struct { OwnCloudSQL OwnCloudSQLDriver `yaml:"owncloudsql"` Posix PosixDriver `yaml:"posix"` - S3 S3Driver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs - EOS EOSDriver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs - Local LocalDriver `yaml:",omitempty"` // not supported by the oCIS product, therefore not part of docs + S3 S3Driver `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs + EOS EOSDriver `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs + Local LocalDriver `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs } // AsyncPropagatorOptions configures the async propagator @@ -131,8 +131,8 @@ type OCISDriver struct { GeneralSpacePathTemplate string `yaml:"generalspacepath_template" env:"STORAGE_USERS_OCIS_GENERAL_SPACE_PATH_TEMPLATE" desc:"Template string to construct the paths of the projects space roots." introductionVersion:"6.0.0"` // 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." introductionVersion:"pre5.0"` - 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 will be used." introductionVersion:"pre5.0"` - LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_USERS_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 will be used." introductionVersion:"pre5.0"` + MaxAcquireLockCycles int `yaml:"max_acquire_lock_cycles" env:"STORAGE_USERS_OCIS_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, OpenCloud 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 will be used." introductionVersion:"pre5.0"` + LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_USERS_OCIS_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, OpenCloud 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 will be used." introductionVersion:"pre5.0"` MaxConcurrency int `yaml:"max_concurrency" env:"OC_MAX_CONCURRENCY;STORAGE_USERS_OCIS_MAX_CONCURRENCY" desc:"Maximum number of concurrent go-routines. Higher values can potentially get work done faster but will also cause more load on the system. Values of 0 or below will be ignored and the default value will be used." introductionVersion:"pre5.0"` AsyncUploads bool `yaml:"async_uploads" env:"OC_ASYNC_UPLOADS" desc:"Enable asynchronous file uploads." introductionVersion:"pre5.0"` MaxQuota uint64 `yaml:"max_quota" env:"OC_SPACES_MAX_QUOTA;STORAGE_USERS_OCIS_MAX_QUOTA" desc:"Set a global max quota for spaces in bytes. A value of 0 equals unlimited. If not using the global OC_SPACES_MAX_QUOTA, you must define the FRONTEND_MAX_QUOTA in the frontend service." introductionVersion:"pre5.0"` @@ -168,8 +168,8 @@ type S3NGDriver struct { GeneralSpacePathTemplate string `yaml:"generalspacepath_template" env:"STORAGE_USERS_S3NG_GENERAL_SPACE_PATH_TEMPLATE" desc:"Template string to construct the paths of the projects space roots." introductionVersion:"6.0.0"` // ShareFolder defines the name of the folder jailing all shares ShareFolder string `yaml:"share_folder" env:"STORAGE_USERS_S3NG_SHARE_FOLDER" desc:"Name of the folder jailing all shares." introductionVersion:"pre5.0"` - MaxAcquireLockCycles int `yaml:"max_acquire_lock_cycles" env:"STORAGE_USERS_S3NG_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." introductionVersion:"pre5.0"` - LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_USERS_S3NG_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." introductionVersion:"pre5.0"` + MaxAcquireLockCycles int `yaml:"max_acquire_lock_cycles" env:"STORAGE_USERS_S3NG_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, OpenCloud 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." introductionVersion:"pre5.0"` + LockCycleDurationFactor int `yaml:"lock_cycle_duration_factor" env:"STORAGE_USERS_S3NG_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, OpenCloud 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." introductionVersion:"pre5.0"` MaxConcurrency int `yaml:"max_concurrency" env:"OC_MAX_CONCURRENCY;STORAGE_USERS_S3NG_MAX_CONCURRENCY" desc:"Maximum number of concurrent go-routines. Higher values can potentially get work done faster but will also cause more load on the system. Values of 0 or below will be ignored and the default value of 100 will be used." introductionVersion:"pre5.0"` DisableVersioning bool `yaml:"disable_versioning" env:"OC_DISABLE_VERSIONING" desc:"Disables versioning of files. When set to true, new uploads with the same filename will overwrite existing files instead of creating a new version." introductionVersion:"7.0.0"` } diff --git a/services/storage-users/pkg/revaconfig/config.go b/services/storage-users/pkg/revaconfig/config.go index 760022a1d..bdb182f37 100644 --- a/services/storage-users/pkg/revaconfig/config.go +++ b/services/storage-users/pkg/revaconfig/config.go @@ -8,7 +8,7 @@ import ( "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" ) -// StorageUsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. +// StorageUsersConfigFromStruct will adapt an OpenCloud config struct into a reva mapstructure to start a reva service. func StorageUsersConfigFromStruct(cfg *config.Config) map[string]interface{} { rcfg := map[string]interface{}{ "core": map[string]interface{}{