inboxLazyJobConcurrency

mei23 · Sep 12, 2023 · 3e8c932 · 3e8c932
1 parent 8161bab
commit 3e8c932
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.config/example.yml b/.config/example.yml
@@ -184,6 +184,7 @@ themeColor: '#fb4e4e'
 # Job concurrency per worker (Default: deliver=cpu x 8, inbox=cpu x 1)
 # deliverJobConcurrency: 128
 # inboxJobConcurrency: 16
+# inboxLazyJobConcurrency: 1
 
 # Job late limiter (Default: nolimit, 変更しないことを推奨)
 # deliverJobPerSec: 128

diff --git a/src/config/types.ts b/src/config/types.ts
@@ -72,6 +72,7 @@ export type Source = {
 
 	deliverJobConcurrency?: number;
 	inboxJobConcurrency?: number;
+	inboxLazyJobConcurrency?: number;
 	deliverJobPerSec?: number;
 	inboxJobPerSec?: number;
 	deliverJobMaxAttempts?: number;

diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts
@@ -3,7 +3,7 @@ import Xev from 'xev';
 import { deliverQueue, inboxQueue, inboxLazyQueue } from '../queue/queues';
 import config from '../config';
 import { getWorkerStrategies } from '..';
-import { deliverJobConcurrency, inboxJobConcurrency } from '../queue';
+import { deliverJobConcurrency, inboxJobConcurrency, inboxLazyJobConcurrency } from '../queue';
 
 const ev = new Xev();
 
@@ -59,7 +59,7 @@ export default function() {
 				delayed: inboxJobCounts.delayed
 			},
 			inboxLazy: {
-				limit: 1 * workers,
+				limit: inboxLazyJobConcurrency * workers,
 				activeSincePrevTick: activeInboxLazyJobs,
 				active: inboxLazyJobCounts.active,
 				waiting: inboxLazyJobCounts.waiting,

diff --git a/src/queue/index.ts b/src/queue/index.ts
@@ -27,6 +27,7 @@ let inboxDeltaCounts = 0;
 
 export const deliverJobConcurrency = config.deliverJobConcurrency || ((cpus().length || 4) * 8);
 export const inboxJobConcurrency = config.inboxJobConcurrency || ((cpus().length || 4) * 1);
+export const inboxLazyJobConcurrency = config.inboxLazyJobConcurrency || 1;
 
 deliverQueue
 	.on('waiting', (jobId) => {
@@ -368,7 +369,7 @@ export default function() {
 	deliverQueue.process(deliverJobConcurrency, processDeliver);
 	webpushDeliverQueue.process(8, processWebpushDeliver);
 	inboxQueue.process(inboxJobConcurrency, processInbox);
-	inboxLazyQueue.process(1, processInbox);
+	inboxLazyQueue.process(inboxLazyJobConcurrency, processInbox);
 	processDb(dbQueue);
 }