From 25f3ccad574551cb242d9b1c34ea6bd35b14c326 Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sun, 7 Jun 2026 10:13:29 -0700 Subject: [PATCH] fix: delete acknowledged riot job stream entries --- .../modules/global/garnet/garnet.service.ts | 14 +++--- .../riot-job-worker.service.spec.ts | 50 ++++++++++++++++--- .../riot-job-queue/riot-job-worker.service.ts | 39 ++++++++++++--- 3 files changed, 84 insertions(+), 19 deletions(-) diff --git a/apps/api/src/modules/global/garnet/garnet.service.ts b/apps/api/src/modules/global/garnet/garnet.service.ts index c79b30d9..2b50df91 100644 --- a/apps/api/src/modules/global/garnet/garnet.service.ts +++ b/apps/api/src/modules/global/garnet/garnet.service.ts @@ -1,9 +1,4 @@ -import { - Inject, - Injectable, - Logger, - OnModuleDestroy, -} from '@nestjs/common'; +import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common'; import type { createClient } from 'redis'; import { GARNET_CLIENT } from './garnet.constants'; @@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy { return this.client.xAck(key, group, ids); } + public async deleteStreamEntries( + key: string, + ids: string | string[], + ): Promise { + return this.client.xDel(key, ids); + } + public async streamLength(key: string): Promise { return this.client.xLen(key); } diff --git a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts index a35c8462..cca7bc82 100644 --- a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts +++ b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts @@ -17,6 +17,7 @@ function execResult(value: T) { function makeWorker() { const garnetService = { acknowledgeStream: jest.fn().mockResolvedValue(undefined), + deleteStreamEntries: jest.fn().mockResolvedValue(undefined), } as unknown as jest.Mocked; const jobQueueService = { markProcessing: jest.fn().mockResolvedValue(undefined), @@ -74,6 +75,32 @@ function makeWorker() { } describe('RiotJobWorkerService', () => { + it('acknowledges and deletes invalid stream entries', async () => { + const { worker, garnetService } = makeWorker(); + + await ( + worker as unknown as { + processEntry: ( + stream: string, + entry: { id: string; message: Record }, + ) => Promise; + } + ).processEntry('riot:queue:high', { + id: 'bad-1', + message: { job: 'not-json' }, + }); + + expect(garnetService.acknowledgeStream).toHaveBeenCalledWith( + 'riot:queue:high', + RIOT_JOB_GROUP, + 'bad-1', + ); + expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith( + 'riot:queue:high', + 'bad-1', + ); + }); + it('refreshes league entries while processing user history refresh jobs', async () => { const { worker, enrichmentService, recentMatchesService, garnetService } = makeWorker(); @@ -91,12 +118,14 @@ describe('RiotJobWorkerService', () => { priority: 'high', }; - await (worker as unknown as { - processEntry: ( - stream: string, - entry: { id: string; message: Record }, - ) => Promise; - }).processEntry('riot:queue:high', { + await ( + worker as unknown as { + processEntry: ( + stream: string, + entry: { id: string; message: Record }, + ) => Promise; + } + ).processEntry('riot:queue:high', { id: '1-0', message: { job: JSON.stringify(job) }, }); @@ -112,5 +141,14 @@ describe('RiotJobWorkerService', () => { RIOT_JOB_GROUP, '1-0', ); + expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith( + 'riot:queue:high', + '1-0', + ); + expect( + garnetService.acknowledgeStream.mock.invocationCallOrder[0], + ).toBeLessThan( + garnetService.deleteStreamEntries.mock.invocationCallOrder[0], + ); }); }); diff --git a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts index 0c7b6e44..8ed9ebc6 100644 --- a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts +++ b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts @@ -79,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { } } - private async processEntry(stream: string, entry: StreamEntry): Promise { + private async processEntry( + stream: string, + entry: StreamEntry, + ): Promise { const job = this.parseJob(entry); if (!job) { - await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id); + await this.acknowledgeAndDelete(stream, entry.id); return; } @@ -134,7 +137,30 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { }`, ); } finally { - await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id); + await this.acknowledgeAndDelete(stream, entry.id); + } + } + + private async acknowledgeAndDelete( + stream: string, + id: string, + ): Promise { + await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id); + await this.deleteAcknowledgedEntry(stream, id); + } + + private async deleteAcknowledgedEntry( + stream: string, + id: string, + ): Promise { + try { + await this.garnetService.deleteStreamEntries(stream, id); + } catch (error) { + this.logger.warn( + `Failed to delete acknowledged Riot job stream entry ${stream} ${id}: ${ + error instanceof Error ? error.message : error + }`, + ); } } @@ -192,9 +218,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { return job.kind === 'poll-tournament-result'; } - private isLegacyImportJob( - job: RiotJobPayload, - ): job is LegacyImportMemberJob { + private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob { return job.kind === 'legacy-import-member'; } @@ -219,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { try { await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP); } catch (error) { - const message = error instanceof Error ? error.message : String(error); + const message = + error instanceof Error ? error.message : String(error); if (!message.includes('BUSYGROUP')) throw error; } }),