Skip to content

Commit 3aaf648

Browse files
authored
Change default queue settings to be low go-routines (#15964)
This PR suggests a change to the default configuration for queues: * Use a common DATADIR for the queues * Set starting workers to 0 and make boost a single worker Signed-off-by: Andrew Thornton <[email protected]>
1 parent 6021fbf commit 3aaf648

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

modules/setting/indexer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var (
5151
IssueConnStr: "",
5252
IssueIndexerName: "gitea_issues",
5353
IssueQueueType: LevelQueueType,
54-
IssueQueueDir: "indexers/issues.queue",
54+
IssueQueueDir: "queues/common",
5555
IssueQueueConnStr: "",
5656
IssueQueueBatchNumber: 20,
5757

@@ -76,7 +76,7 @@ func newIndexerService() {
7676
Indexer.IssueIndexerName = sec.Key("ISSUE_INDEXER_NAME").MustString(Indexer.IssueIndexerName)
7777

7878
Indexer.IssueQueueType = sec.Key("ISSUE_INDEXER_QUEUE_TYPE").MustString(LevelQueueType)
79-
Indexer.IssueQueueDir = sec.Key("ISSUE_INDEXER_QUEUE_DIR").MustString(path.Join(AppDataPath, "indexers/issues.queue"))
79+
Indexer.IssueQueueDir = sec.Key("ISSUE_INDEXER_QUEUE_DIR").MustString(path.Join(AppDataPath, "queues/common"))
8080
Indexer.IssueQueueConnStr = sec.Key("ISSUE_INDEXER_QUEUE_CONN_STR").MustString("")
8181
Indexer.IssueQueueBatchNumber = sec.Key("ISSUE_INDEXER_QUEUE_BATCH_NUMBER").MustInt(20)
8282

modules/setting/queue.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func GetQueueSettings(name string) QueueSettings {
4848
q.Name = name
4949

5050
// DataDir is not directly inheritable
51-
q.DataDir = filepath.Join(Queue.DataDir, name)
51+
q.DataDir = filepath.Join(Queue.DataDir, "common")
5252
// QueueName is not directly inheritable either
5353
q.QueueName = name + Queue.QueueName
5454
for _, key := range sec.Keys() {
@@ -103,11 +103,11 @@ func NewQueueService() {
103103
Queue.WrapIfNecessary = sec.Key("WRAP_IF_NECESSARY").MustBool(true)
104104
Queue.MaxAttempts = sec.Key("MAX_ATTEMPTS").MustInt(10)
105105
Queue.Timeout = sec.Key("TIMEOUT").MustDuration(GracefulHammerTime + 30*time.Second)
106-
Queue.Workers = sec.Key("WORKERS").MustInt(1)
106+
Queue.Workers = sec.Key("WORKERS").MustInt(0)
107107
Queue.MaxWorkers = sec.Key("MAX_WORKERS").MustInt(10)
108108
Queue.BlockTimeout = sec.Key("BLOCK_TIMEOUT").MustDuration(1 * time.Second)
109109
Queue.BoostTimeout = sec.Key("BOOST_TIMEOUT").MustDuration(5 * time.Minute)
110-
Queue.BoostWorkers = sec.Key("BOOST_WORKERS").MustInt(5)
110+
Queue.BoostWorkers = sec.Key("BOOST_WORKERS").MustInt(1)
111111
Queue.QueueName = sec.Key("QUEUE_NAME").MustString("_queue")
112112
Queue.SetName = sec.Key("SET_NAME").MustString("")
113113

0 commit comments

Comments
 (0)