mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 21:00:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10578 from owncloud/fix-sharing-concurrency-env

Browse Source 
fix sharing concurrency env
This commit is contained in:
Jörn Friedrich Dreyer
2024-11-15 14:32:24 +01:00
committed by GitHub
parent ede5f0fece 65aea4438d
commit fb2755c3ac
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/unreleased/limit-sharing-workers.md
View File

@@ -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

2
services/sharing/pkg/config/config.go
View File

@@ -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"`