頻繁にAPリクエストが発生するサーバーに対してfetchInstanceMetadata手動更新が無視される問題を修正 (MisskeyIO#194)

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -52,20 +52,20 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	public async tryLock(host: string): Promise<boolean> {
-		const mutex = await this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '1', 'EX', 60 * 5, 'NX', 'GET');
+		const mutex = await this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, Date.now(), 'EX', 60 * 5, 'NX');
-		return mutex !== '1';
+		return mutex !== null;
 	}
 
 	@bindThis
 	public unlock(host: string): Promise<number> {
-		return this.redisClient.del(`fetchInstanceMetadata:mutex:${host}`);
+		return this.redisClient.unlink(`fetchInstanceMetadata:mutex:${host}`);
 	}
 
 	@bindThis
 	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
 		const host = instance.host;
 		// Acquire mutex to ensure no parallel runs
-		if (!await this.tryLock(host)) return;
+		if (!await this.tryLock(host) && !force) return;
 		try {
 			if (!force) {
 				const _instance = await this.federatedInstanceService.fetch(host);

packages/backend/test/unit/FetchInstanceMetadataService.ts

@@ -23,9 +23,10 @@ import type { MockFunctionMetadata } from 'jest-mock';
 function mockRedis() {
 	const hash = {};
 	const set = jest.fn((key, value) => {
-		const ret = hash[key];
+		// このテストで呼び出すSETにはNXオプションが付いてる
+		if (hash[key]) return null;
 		hash[key] = value;
-		return ret;
+		return 'OK';
 	});
 	return set;
 }