diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-07-27 16:40:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 16:40:35 +0800 |
| commit | 8baa42c8d749381649404ecb194b8510af11ba0a (patch) | |
| tree | ba1ef17894522c40eb41d3f9c484ccd9ba1a50d2 /modules | |
| parent | 73fb1ecdcf7c72c9b15caa70a8e3f444d311bd7b (diff) | |
| download | gitea-8baa42c8d749381649404ecb194b8510af11ba0a.tar.gz gitea-8baa42c8d749381649404ecb194b8510af11ba0a.zip | |
Calculate MAX_WORKERS default value by CPU number (#26177)
To avoid consuming user's 100% CPU, limit the default value of
MAX_WORKERS
Fix #26063 (the CPU 100% problem mentioned in it)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/queue/manager_test.go | 8 | ||||
| -rw-r--r-- | modules/setting/queue.go | 29 |
2 files changed, 22 insertions, 15 deletions
diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index 1fd29f813f..9a5b616b1a 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -51,7 +51,7 @@ CONN_STR = redis:// assert.Equal(t, "", q.baseConfig.ConnStr) assert.Equal(t, "default_queue", q.baseConfig.QueueFullName) assert.Equal(t, "default_queue_unique", q.baseConfig.SetFullName) - assert.Equal(t, 10, q.GetWorkerMaxNumber()) + assert.NotZero(t, q.GetWorkerMaxNumber()) assert.Equal(t, 0, q.GetWorkerNumber()) assert.Equal(t, 0, q.GetWorkerActiveNumber()) assert.Equal(t, 0, q.GetQueueItemNumber()) @@ -75,7 +75,7 @@ BATCH_LENGTH = 22 CONN_STR = QUEUE_NAME = _q2 SET_NAME = _u2 -MAX_WORKERS = 2 +MAX_WORKERS = 123 `) assert.NoError(t, err) @@ -89,7 +89,7 @@ MAX_WORKERS = 2 assert.Equal(t, "addrs=127.0.0.1:6379 db=0", q1.baseConfig.ConnStr) assert.Equal(t, "no-such_queue1", q1.baseConfig.QueueFullName) assert.Equal(t, "no-such_queue1_unique", q1.baseConfig.SetFullName) - assert.Equal(t, 10, q1.GetWorkerMaxNumber()) + assert.NotZero(t, q1.GetWorkerMaxNumber()) assert.Equal(t, 0, q1.GetWorkerNumber()) assert.Equal(t, 0, q1.GetWorkerActiveNumber()) assert.Equal(t, 0, q1.GetQueueItemNumber()) @@ -105,7 +105,7 @@ MAX_WORKERS = 2 assert.Equal(t, "", q2.baseConfig.ConnStr) assert.Equal(t, "sub_q2", q2.baseConfig.QueueFullName) assert.Equal(t, "sub_q2_u2", q2.baseConfig.SetFullName) - assert.Equal(t, 2, q2.GetWorkerMaxNumber()) + assert.Equal(t, 123, q2.GetWorkerMaxNumber()) assert.Equal(t, 0, q2.GetWorkerNumber()) assert.Equal(t, 0, q2.GetWorkerActiveNumber()) assert.Equal(t, 0, q2.GetQueueItemNumber()) diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 8673537b52..fc15bd07ed 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -5,6 +5,7 @@ package setting import ( "path/filepath" + "runtime" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" @@ -25,18 +26,24 @@ type QueueSettings struct { MaxWorkers int } -var queueSettingsDefault = QueueSettings{ - Type: "level", // dummy, channel, level, redis - Datadir: "queues/common", // relative to AppDataPath - Length: 100, // queue length before a channel queue will block - - QueueName: "_queue", - SetName: "_unique", - BatchLength: 20, - MaxWorkers: 10, -} - func GetQueueSettings(rootCfg ConfigProvider, name string) (QueueSettings, error) { + queueSettingsDefault := QueueSettings{ + Type: "level", // dummy, channel, level, redis + Datadir: "queues/common", // relative to AppDataPath + Length: 100, // queue length before a channel queue will block + + QueueName: "_queue", + SetName: "_unique", + BatchLength: 20, + MaxWorkers: runtime.NumCPU() / 2, + } + if queueSettingsDefault.MaxWorkers < 1 { + queueSettingsDefault.MaxWorkers = 1 + } + if queueSettingsDefault.MaxWorkers > 10 { + queueSettingsDefault.MaxWorkers = 10 + } + // deep copy default settings cfg := QueueSettings{} if cfgBs, err := json.Marshal(queueSettingsDefault); err != nil { |