Skip to content

Commit 478e704

Browse files
GiteaBotwolfogre
andauthored
Increase queue length (#27555) (#27562)
Backport #27555 by @wolfogre It should be OK to increase the default queue length since the default type is "level". IMO, the old default length (100) is a little too small. See #27540 (comment) IIRC, a larger length could lead to more memory usage only when the type is "channel," but it's an obscure case. Otherwise, it's just a limit (for "level" or "redis"). Co-authored-by: Jason Song <[email protected]>
1 parent 63587a4 commit 478e704

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

custom/conf/app.example.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ LEVEL = Info
14201420
;DATADIR = queues/ ; Relative paths will be made absolute against `%(APP_DATA_PATH)s`.
14211421
;;
14221422
;; Default queue length before a channel queue will block
1423-
;LENGTH = 100
1423+
;LENGTH = 100000
14241424
;;
14251425
;; Batch size to send for batched queues
14261426
;BATCH_LENGTH = 20

docs/content/administration/config-cheat-sheet.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ Configuration at `[queue]` will set defaults for queues with overrides for indiv
483483

484484
- `TYPE`: **level**: General queue type, currently support: `level` (uses a LevelDB internally), `channel`, `redis`, `dummy`. Invalid types are treated as `level`.
485485
- `DATADIR`: **queues/common**: Base DataDir for storing level queues. `DATADIR` for individual queues can be set in `queue.name` sections. Relative paths will be made absolute against `%(APP_DATA_PATH)s`.
486-
- `LENGTH`: **100**: Maximal queue size before channel queues block
486+
- `LENGTH`: **100000**: Maximal queue size before channel queues block
487487
- `BATCH_LENGTH`: **20**: Batch data before passing to the handler
488488
- `CONN_STR`: **redis://127.0.0.1:6379/0**: Connection string for the redis queue type. For `redis-cluster` use `redis+cluster://127.0.0.1:6379/0`. Options can be set using query params. Similarly, LevelDB options can also be set using: **leveldb://relative/path?option=value** or **leveldb:///absolute/path?option=value**, and will override `DATADIR`
489489
- `QUEUE_NAME`: **_queue**: The suffix for default redis and disk queue name. Individual queues will default to **`name`**`QUEUE_NAME` but can be overridden in the specific `queue.name` section.

docs/content/administration/config-cheat-sheet.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ menu:
472472

473473
- `TYPE`**level**:通用队列类型,当前支持:`level`(在内部使用 LevelDB)、`channel``redis``dummy`。无效的类型将视为 `level`
474474
- `DATADIR`**queues/common**:用于存储 level 队列的基本 DataDir。单独的队列的 `DATADIR` 可以在 `queue.name` 部分进行设置。相对路径将根据 `%(APP_DATA_PATH)s` 变为绝对路径。
475-
- `LENGTH`**100**:通道队列阻塞之前的最大队列大小
475+
- `LENGTH`**100000**:通道队列阻塞之前的最大队列大小
476476
- `BATCH_LENGTH`**20**:在传递给处理程序之前批处理数据
477477
- `CONN_STR`**redis://127.0.0.1:6379/0**:redis 队列类型的连接字符串。对于 `redis-cluster`,使用 `redis+cluster://127.0.0.1:6379/0`。可以使用查询参数来设置选项。类似地,LevelDB 选项也可以使用:**leveldb://relative/path?option=value****leveldb:///absolute/path?option=value** 进行设置,并将覆盖 `DATADIR`
478478
- `QUEUE_NAME`**_queue**:默认的 redis 和磁盘队列名称的后缀。单独的队列将默认为 **`name`**`QUEUE_NAME`,但可以在特定的 `queue.name` 部分中进行覆盖。

modules/queue/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CONN_STR = redis://
4646
assert.Equal(t, "default", q.GetName())
4747
assert.Equal(t, "level", q.GetType())
4848
assert.Equal(t, filepath.Join(setting.AppDataPath, "queues/common"), q.baseConfig.DataFullDir)
49-
assert.Equal(t, 100, q.baseConfig.Length)
49+
assert.Equal(t, 100000, q.baseConfig.Length)
5050
assert.Equal(t, 20, q.batchLength)
5151
assert.Equal(t, "", q.baseConfig.ConnStr)
5252
assert.Equal(t, "default_queue", q.baseConfig.QueueFullName)

modules/setting/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func GetQueueSettings(rootCfg ConfigProvider, name string) (QueueSettings, error
3030
queueSettingsDefault := QueueSettings{
3131
Type: "level", // dummy, channel, level, redis
3232
Datadir: "queues/common", // relative to AppDataPath
33-
Length: 100, // queue length before a channel queue will block
33+
Length: 100000, // queue length before a channel queue will block
3434

3535
QueueName: "_queue",
3636
SetName: "_unique",

0 commit comments

Comments
 (0)