diff --git a/grpc_apis/ocis/messages/search/v0/grpc.md b/grpc_apis/ocis/messages/search/v0/grpc.md index 3c12e8fe916..a59c808c78b 100644 --- a/grpc_apis/ocis/messages/search/v0/grpc.md +++ b/grpc_apis/ocis/messages/search/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.search.v0" url: /grpc_apis/ocis_messages_search_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md index 96f92f9ca6f..a483bca0f98 100644 --- a/grpc_apis/ocis/messages/settings/v0/grpc.md +++ b/grpc_apis/ocis/messages/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.settings.v0" url: /grpc_apis/ocis_messages_settings_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md index fdb005d364a..27965de9278 100644 --- a/grpc_apis/ocis/messages/store/v0/grpc.md +++ b/grpc_apis/ocis/messages/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.store.v0" url: /grpc_apis/ocis_messages_store_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md index f6802e99f33..106f8f72663 100644 --- a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.thumbnails.v0" url: /grpc_apis/ocis_messages_thumbnails_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/search/v0/grpc.md b/grpc_apis/ocis/services/search/v0/grpc.md index 72c441b0f21..65aef89d41f 100644 --- a/grpc_apis/ocis/services/search/v0/grpc.md +++ b/grpc_apis/ocis/services/search/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.search.v0" url: /grpc_apis/ocis_services_search_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md index b08ad910c80..b18e91ec442 100644 --- a/grpc_apis/ocis/services/settings/v0/grpc.md +++ b/grpc_apis/ocis/services/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.settings.v0" url: /grpc_apis/ocis_services_settings_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md index 1b0ff7a473e..8c7aceb90e7 100644 --- a/grpc_apis/ocis/services/store/v0/grpc.md +++ b/grpc_apis/ocis/services/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.store.v0" url: /grpc_apis/ocis_services_store_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md index 0dddc3ac840..efcf7efa892 100644 --- a/grpc_apis/ocis/services/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/services/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.thumbnails.v0" url: /grpc_apis/ocis_services_thumbnails_v0 -date: 2022-11-25T12:48:51Z +date: 2022-11-25T13:48:41Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/services/_includes/adoc/storage-system_configvars.adoc b/services/_includes/adoc/storage-system_configvars.adoc index b44c52b9839..705b8db9a01 100644 --- a/services/_includes/adoc/storage-system_configvars.adoc +++ b/services/_includes/adoc/storage-system_configvars.adoc @@ -211,6 +211,20 @@ a| [subs=-attributes] ++~/.ocis/storage/metadata ++ a| [subs=-attributes] Path for the directory where the STORAGE-SYSTEM service stores it's persistent data. +|`STORAGE_SYSTEM_OCIS_MAX_ACQUIRE_LOCK_CYCLES` +a| [subs=-attributes] +++int ++ +a| [subs=-attributes] +++20 ++ +a| [subs=-attributes] +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. +|`STORAGE_SYSTEM_OCIS_LOCK_CYCLE_DURATION_FACTOR` +a| [subs=-attributes] +++int ++ +a| [subs=-attributes] +++30 ++ +a| [subs=-attributes] +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. |`STORAGE_SYSTEM_DATA_SERVER_URL` a| [subs=-attributes] ++string ++ diff --git a/services/_includes/adoc/storage-users_configvars.adoc b/services/_includes/adoc/storage-users_configvars.adoc index ae1b20de32c..8be8a89e315 100644 --- a/services/_includes/adoc/storage-users_configvars.adoc +++ b/services/_includes/adoc/storage-users_configvars.adoc @@ -236,9 +236,16 @@ Name of the folder jailing all shares. a| [subs=-attributes] ++int ++ a| [subs=-attributes] -++25 ++ +++20 ++ a| [subs=-attributes] -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 +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. +|`STORAGE_USERS_OCIS_LOCK_CYCLE_DURATION_FACTOR` +a| [subs=-attributes] +++int ++ +a| [subs=-attributes] +++30 ++ +a| [subs=-attributes] +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. |`STORAGE_USERS_S3NG_ROOT` a| [subs=-attributes] ++string ++ @@ -317,6 +324,20 @@ a| [subs=-attributes] ++/Shares ++ a| [subs=-attributes] Name of the folder jailing all shares. +|`STORAGE_USERS_S3NG_MAX_ACQUIRE_LOCK_CYCLES` +a| [subs=-attributes] +++int ++ +a| [subs=-attributes] +++20 ++ +a| [subs=-attributes] +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. +|`STORAGE_USERS_S3NG_LOCK_CYCLE_DURATION_FACTOR` +a| [subs=-attributes] +++int ++ +a| [subs=-attributes] +++30 ++ +a| [subs=-attributes] +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. |`STORAGE_USERS_OWNCLOUDSQL_DATADIR` a| [subs=-attributes] ++string ++ diff --git a/services/_includes/storage-system-config-example.yaml b/services/_includes/storage-system-config-example.yaml index e744fe4b7dd..623ea3db22d 100644 --- a/services/_includes/storage-system-config-example.yaml +++ b/services/_includes/storage-system-config-example.yaml @@ -40,4 +40,6 @@ driver: ocis drivers: ocis: root: ~/.ocis/storage/metadata + max_acquire_lock_cycles: 20 + lock_cycle_duration_factor: 30 data_server_url: http://localhost:9216/data diff --git a/services/_includes/storage-system_configvars.md b/services/_includes/storage-system_configvars.md index cfe2fe427d5..5562412f096 100644 --- a/services/_includes/storage-system_configvars.md +++ b/services/_includes/storage-system_configvars.md @@ -30,4 +30,6 @@ | STORAGE_SYSTEM_SKIP_USER_GROUPS_IN_TOKEN | bool | false | Disables the loading of user's group memberships from the reva access token.| | STORAGE_SYSTEM_DRIVER | string | ocis | The driver which should be used by the service.| | STORAGE_SYSTEM_OCIS_ROOT | string | ~/.ocis/storage/metadata | Path for the directory where the STORAGE-SYSTEM service stores it's persistent data.| +| STORAGE_SYSTEM_OCIS_MAX_ACQUIRE_LOCK_CYCLES | int | 20 | 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.| +| STORAGE_SYSTEM_OCIS_LOCK_CYCLE_DURATION_FACTOR | int | 30 | 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.| | STORAGE_SYSTEM_DATA_SERVER_URL | string | http://localhost:9216/data | URL of the data server, needs to be reachable by other services using this service.| \ No newline at end of file diff --git a/services/_includes/storage-users-config-example.yaml b/services/_includes/storage-users-config-example.yaml index 0bd5a9a739a..da60a003a8e 100644 --- a/services/_includes/storage-users-config-example.yaml +++ b/services/_includes/storage-users-config-example.yaml @@ -44,7 +44,8 @@ drivers: personalspacealias_template: '{{.SpaceType}}/{{.User.Username | lower}}' generalspacealias_template: '{{.SpaceType}}/{{.SpaceName | replace " " "-" | lower}}' share_folder: /Shares - max_acquire_lock_cycles: 25 + max_acquire_lock_cycles: 20 + lock_cycle_duration_factor: 30 s3ng: root: ~/.ocis/storage/users user_layout: '{{.Id.OpaqueId}}' @@ -57,6 +58,8 @@ drivers: personalspacealias_template: '{{.SpaceType}}/{{.User.Username | lower}}' generalspacealias_template: '{{.SpaceType}}/{{.SpaceName | replace " " "-" | lower}}' share_folder: /Shares + max_acquire_lock_cycles: 20 + lock_cycle_duration_factor: 30 owncloudsql: root: ~/.ocis/storage/owncloud share_folder: /Shares diff --git a/services/_includes/storage-users_configvars.md b/services/_includes/storage-users_configvars.md index 4697f646d63..523f3682d57 100644 --- a/services/_includes/storage-users_configvars.md +++ b/services/_includes/storage-users_configvars.md @@ -33,7 +33,8 @@ | STORAGE_USERS_OCIS_PERSONAL_SPACE_ALIAS_TEMPLATE | string | {{.SpaceType}}/{{.User.Username \| lower}} | Template string to construct personal space aliases.| | STORAGE_USERS_OCIS_GENERAL_SPACE_ALIAS_TEMPLATE | string | {{.SpaceType}}/{{.SpaceName \| replace " " "-" \| lower}} | Template string to construct general space aliases.| | STORAGE_USERS_OCIS_SHARE_FOLDER | string | /Shares | Name of the folder jailing all shares.| -| STORAGE_USERS_OCIS_MAX_ACQUIRE_LOCK_CYCLES | int | 25 | 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| +| STORAGE_USERS_OCIS_MAX_ACQUIRE_LOCK_CYCLES | int | 20 | 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.| +| STORAGE_USERS_OCIS_LOCK_CYCLE_DURATION_FACTOR | int | 30 | 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.| | STORAGE_USERS_S3NG_ROOT | string | ~/.ocis/storage/users | The directory where the filesystem storage will store user files. If not definied, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/users.| | STORAGE_USERS_S3NG_USER_LAYOUT | string | {{.Id.OpaqueId}} | Template string for the user storage layout in the user directory.| | STORAGE_USERS_PERMISSION_ENDPOINT
STORAGE_USERS_S3NG_PERMISSIONS_ENDPOINT | string | 127.0.0.1:9191 | Endpoint of the permissions service.| @@ -45,6 +46,8 @@ | STORAGE_USERS_S3NG_PERSONAL_SPACE_ALIAS_TEMPLATE | string | {{.SpaceType}}/{{.User.Username \| lower}} | Template string to construct personal space aliases.| | STORAGE_USERS_S3NG_GENERAL_SPACE_ALIAS_TEMPLATE | string | {{.SpaceType}}/{{.SpaceName \| replace " " "-" \| lower}} | Template string to construct general space aliases.| | STORAGE_USERS_S3NG_SHARE_FOLDER | string | /Shares | Name of the folder jailing all shares.| +| STORAGE_USERS_S3NG_MAX_ACQUIRE_LOCK_CYCLES | int | 20 | 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.| +| STORAGE_USERS_S3NG_LOCK_CYCLE_DURATION_FACTOR | int | 30 | 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.| | STORAGE_USERS_OWNCLOUDSQL_DATADIR | string | ~/.ocis/storage/owncloud | The directory where the filesystem storage will store SQL migration data. If not definied, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/owncloud.| | STORAGE_USERS_OWNCLOUDSQL_SHARE_FOLDER | string | /Shares | Name of the folder jailing all shares.| | STORAGE_USERS_OWNCLOUDSQL_LAYOUT | string | {{.Username}} | Path layout to use to navigate into a users folder in an owncloud data directory|