sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

limit the number of workers of the jsoncs3 share manager

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2024-11-14 17:43:47 +01:00
parent b52e6cc470
commit 53c48dcb5d
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/limit-sharing-workers.md
+5
View File
@@ -0,0 +1,5 @@
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`.
https://github.com/owncloud/ocis/pull/10552
services/sharing/pkg/config/config.go
+1
View File
@@ -106,6 +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"` 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"` 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"` 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"`
} }
type PublicSharingDrivers struct { type PublicSharingDrivers struct {
JSON PublicSharingJSONDriver `yaml:"json"` JSON PublicSharingJSONDriver `yaml:"json"`
services/sharing/pkg/config/defaults/defaultconfig.go
+3 -2
View File
@@ -45,8 +45,9 @@ func DefaultConfig() *config.Config {
SystemUserIDP: "internal", SystemUserIDP: "internal",
}, },
JSONCS3: config.UserSharingJSONCS3Driver{ JSONCS3: config.UserSharingJSONCS3Driver{
ProviderAddr: "com.owncloud.api.storage-system", ProviderAddr: "com.owncloud.api.storage-system",
SystemUserIDP: "internal", SystemUserIDP: "internal",
MaxConcurrency: 5,
}, },
OwnCloudSQL: config.UserSharingOwnCloudSQLDriver{ OwnCloudSQL: config.UserSharingOwnCloudSQLDriver{
DBUsername: "owncloud", DBUsername: "owncloud",
services/sharing/pkg/revaconfig/config.go
+2 -2
View File
@@ -6,9 +6,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/sharing/pkg/config" "github.com/owncloud/ocis/v2/services/sharing/pkg/config"
) )
@@ -76,6 +75,7 @@ func SharingConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string]
"service_user_idp": cfg.UserSharingDrivers.JSONCS3.SystemUserIDP, "service_user_idp": cfg.UserSharingDrivers.JSONCS3.SystemUserIDP,
"machine_auth_apikey": cfg.UserSharingDrivers.JSONCS3.SystemUserAPIKey, "machine_auth_apikey": cfg.UserSharingDrivers.JSONCS3.SystemUserAPIKey,
"ttl": cfg.UserSharingDrivers.JSONCS3.CacheTTL, "ttl": cfg.UserSharingDrivers.JSONCS3.CacheTTL,
"max_concurrency": cfg.UserSharingDrivers.JSONCS3.MaxConcurrency,
"events": map[string]interface{}{ "events": map[string]interface{}{
"natsaddress": cfg.Events.Addr, "natsaddress": cfg.Events.Addr,
"natsclusterid": cfg.Events.ClusterID, "natsclusterid": cfg.Events.ClusterID,