fix: delete acknowledged riot job stream entries
This commit is contained in:
1 parent
55ab5b27dc
commit
25f3ccad57
3 files changed
+80
-15
No files matched your search
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||||
Inject,
|
|
||||||
Injectable,
|
|
||||||
Logger,
|
|
||||||
OnModuleDestroy,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import type { createClient } from 'redis';
|
import type { createClient } from 'redis';
|
||||||
import { GARNET_CLIENT } from './garnet.constants';
|
import { GARNET_CLIENT } from './garnet.constants';
|
||||||
|
|
||||||
@@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy {
|
|||||||
return this.client.xAck(key, group, ids);
|
return this.client.xAck(key, group, ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async deleteStreamEntries(
|
||||||
|
key: string,
|
||||||
|
ids: string | string[],
|
||||||
|
): Promise<number> {
|
||||||
|
return this.client.xDel(key, ids);
|
||||||
|
}
|
||||||
|
|
||||||
public async streamLength(key: string): Promise<number> {
|
public async streamLength(key: string): Promise<number> {
|
||||||
return this.client.xLen(key);
|
return this.client.xLen(key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ function execResult<T>(value: T) {
|
|||||||
function makeWorker() {
|
function makeWorker() {
|
||||||
const garnetService = {
|
const garnetService = {
|
||||||
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteStreamEntries: jest.fn().mockResolvedValue(undefined),
|
||||||
} as unknown as jest.Mocked<GarnetService>;
|
} as unknown as jest.Mocked<GarnetService>;
|
||||||
const jobQueueService = {
|
const jobQueueService = {
|
||||||
markProcessing: jest.fn().mockResolvedValue(undefined),
|
markProcessing: jest.fn().mockResolvedValue(undefined),
|
||||||
@@ -74,6 +75,32 @@ function makeWorker() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('RiotJobWorkerService', () => {
|
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<string, string> },
|
||||||
|
) => Promise<void>;
|
||||||
|
}
|
||||||
|
).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 () => {
|
it('refreshes league entries while processing user history refresh jobs', async () => {
|
||||||
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
||||||
makeWorker();
|
makeWorker();
|
||||||
@@ -91,12 +118,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
priority: 'high',
|
priority: 'high',
|
||||||
};
|
};
|
||||||
|
|
||||||
await (worker as unknown as {
|
await (
|
||||||
|
worker as unknown as {
|
||||||
processEntry: (
|
processEntry: (
|
||||||
stream: string,
|
stream: string,
|
||||||
entry: { id: string; message: Record<string, string> },
|
entry: { id: string; message: Record<string, string> },
|
||||||
) => Promise<void>;
|
) => Promise<void>;
|
||||||
}).processEntry('riot:queue:high', {
|
}
|
||||||
|
).processEntry('riot:queue:high', {
|
||||||
id: '1-0',
|
id: '1-0',
|
||||||
message: { job: JSON.stringify(job) },
|
message: { job: JSON.stringify(job) },
|
||||||
});
|
});
|
||||||
@@ -112,5 +141,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
RIOT_JOB_GROUP,
|
RIOT_JOB_GROUP,
|
||||||
'1-0',
|
'1-0',
|
||||||
);
|
);
|
||||||
|
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
'1-0',
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
garnetService.acknowledgeStream.mock.invocationCallOrder[0],
|
||||||
|
).toBeLessThan(
|
||||||
|
garnetService.deleteStreamEntries.mock.invocationCallOrder[0],
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -79,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async processEntry(stream: string, entry: StreamEntry): Promise<void> {
|
private async processEntry(
|
||||||
|
stream: string,
|
||||||
|
entry: StreamEntry,
|
||||||
|
): Promise<void> {
|
||||||
const job = this.parseJob(entry);
|
const job = this.parseJob(entry);
|
||||||
if (!job) {
|
if (!job) {
|
||||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
await this.acknowledgeAndDelete(stream, entry.id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +137,30 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}`,
|
}`,
|
||||||
);
|
);
|
||||||
} finally {
|
} 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<void> {
|
||||||
|
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id);
|
||||||
|
await this.deleteAcknowledgedEntry(stream, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async deleteAcknowledgedEntry(
|
||||||
|
stream: string,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
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';
|
return job.kind === 'poll-tournament-result';
|
||||||
}
|
}
|
||||||
|
|
||||||
private isLegacyImportJob(
|
private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob {
|
||||||
job: RiotJobPayload,
|
|
||||||
): job is LegacyImportMemberJob {
|
|
||||||
return job.kind === 'legacy-import-member';
|
return job.kind === 'legacy-import-member';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
try {
|
try {
|
||||||
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
||||||
} catch (error) {
|
} 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;
|
if (!message.includes('BUSYGROUP')) throw error;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
Reference in new issue
Block a user