From 65aea4438d4aa5dd56833214ba17483ea5ff5c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 15 Nov 2024 14:02:03 +0100 Subject: [PATCH] fix sharing concurrency env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/limit-sharing-workers.md | 3 ++- services/sharing/pkg/config/config.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog/unreleased/limit-sharing-workers.md b/changelog/unreleased/limit-sharing-workers.md index 0964756c5..276e33143 100644 --- a/changelog/unreleased/limit-sharing-workers.md +++ b/changelog/unreleased/limit-sharing-workers.md @@ -1,5 +1,6 @@ Bugfix: We now limit the number of workers of the jsoncs3 share manager -We now restrict the number of workers that look up shares to 5. The number can be changed with `SHARING_USER_JSONCS3_MAX_CONCURRENCY`. +We now restrict the number of workers that look up shares to 5. The number can be changed with `SHARING_USER_JSONCS3_MAX_CONCURRENCY` or `OCIS_MAX_CONCURRENCY`. +https://github.com/owncloud/ocis/pull/10578 https://github.com/owncloud/ocis/pull/10552 diff --git a/services/sharing/pkg/config/config.go b/services/sharing/pkg/config/config.go index 11285bb9e..4a1383ff3 100644 --- a/services/sharing/pkg/config/config.go +++ b/services/sharing/pkg/config/config.go @@ -106,7 +106,7 @@ type UserSharingJSONCS3Driver struct { SystemUserIDP string `yaml:"system_user_idp" env:"OCIS_SYSTEM_USER_IDP;SHARING_USER_JSONCS3_SYSTEM_USER_IDP" desc:"IDP of the oCIS STORAGE-SYSTEM system user." introductionVersion:"pre5.0"` SystemUserAPIKey string `yaml:"system_user_api_key" env:"OCIS_SYSTEM_USER_API_KEY;SHARING_USER_JSONCS3_SYSTEM_USER_API_KEY" desc:"API key for the STORAGE-SYSTEM system user." introductionVersion:"pre5.0"` CacheTTL int `yaml:"cache_ttl" env:"SHARING_USER_JSONCS3_CACHE_TTL" desc:"TTL for the internal caches in seconds." introductionVersion:"pre5.0"` - MaxConcurrency int `yaml:"max_concurrency" env:"SHARING_USER_JSONCS3_MAX_CONCURRENCY" desc:"Maximum number of workers for requests to the storage system." introductionVersion:"7.0.0"` + MaxConcurrency int `yaml:"max_concurrency" env:"OCIS_MAX_CONCURRENCY;SHARING_USER_JSONCS3_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:"7.0.0"` } type PublicSharingDrivers struct { JSON PublicSharingJSONDriver `yaml:"json"`