mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-06 04:49:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

change default for MaxConcurrency

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2024-01-29 14:21:19 +01:00
parent 8ed9b1a727
commit 2269d2cf27
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/concurrency-defaults.md Normal file
View File

@@ -0,0 +1,8 @@
Enhancement: Modify the concurrency default
We have changed the default MaxConcurrency value from 100 to 5 to prevent too frequent gc runs on low memory systems.
We have also bumped reva to pull in the related changes from there.
https://github.com/owncloud/ocis/pull/8309
https://github.com/owncloud/ocis/issues/8257
https://github.com/cs3org/reva/pull/4485

2
go.mod
View File

@@ -13,7 +13,7 @@ require (
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/coreos/go-oidc/v3 v3.9.0
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
github.com/cs3org/reva/v2 v2.18.1-0.20240126141248-c9e4a3bcd0da
github.com/cs3org/reva/v2 v2.18.1-0.20240129131717-cff0a2eeb959
github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
github.com/disintegration/imaging v1.6.2
github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

4
go.sum
View File

@@ -1019,8 +1019,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
github.com/cs3org/reva/v2 v2.18.1-0.20240126141248-c9e4a3bcd0da h1:VgWIr/lE6cv2f5IjjWgR0LOAK41gsUytBsSZo/4DRq4=
github.com/cs3org/reva/v2 v2.18.1-0.20240126141248-c9e4a3bcd0da/go.mod h1:GCN3g6uYE0Nvd31dGlhaGGyUviUfbG2NkecPRv5oSc4=
github.com/cs3org/reva/v2 v2.18.1-0.20240129131717-cff0a2eeb959 h1:8uiYRWlbrhQJk4pHawpJUTFx/Yy0G5yvMYam2TMKDYo=
github.com/cs3org/reva/v2 v2.18.1-0.20240129131717-cff0a2eeb959/go.mod h1:GCN3g6uYE0Nvd31dGlhaGGyUviUfbG2NkecPRv5oSc4=
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

2
services/storage-users/pkg/config/defaults/defaultconfig.go
View File

@@ -73,6 +73,7 @@ func DefaultConfig() *config.Config {
GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
PermissionsEndpoint: "com.owncloud.api.settings",
MaxAcquireLockCycles: 20,
MaxConcurrency: 5,
LockCycleDurationFactor: 30,
},
OCIS: config.OCISDriver{
@@ -85,6 +86,7 @@ func DefaultConfig() *config.Config {
GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
PermissionsEndpoint: "com.owncloud.api.settings",
MaxAcquireLockCycles: 20,
MaxConcurrency: 5,
LockCycleDurationFactor: 30,
AsyncUploads: true,
},

2
vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options/options.go generated vendored
View File

@@ -149,7 +149,7 @@ func New(m map[string]interface{}) (*Options, error) {
}
if o.MaxConcurrency <= 0 {
o.MaxConcurrency = 100
o.MaxConcurrency = 5
}
if o.Propagator == "" {

2
vendor/modules.txt vendored
View File

@@ -362,7 +362,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
github.com/cs3org/go-cs3apis/cs3/types/v1beta1
# github.com/cs3org/reva/v2 v2.18.1-0.20240126141248-c9e4a3bcd0da
# github.com/cs3org/reva/v2 v2.18.1-0.20240129131717-cff0a2eeb959
## explicit; go 1.21
github.com/cs3org/reva/v2/cmd/revad/internal/grace
github.com/cs3org/reva/v2/cmd/revad/runtime