감사 정책 head 유실을 복구하고 데몬 준비 상태로 배포를 검증한다
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
import { GamePrisma, type InputJsonValue } from '@sammo-ts/infra';
|
||||
import { auditPolicyHash, type PendingAuditPolicy } from './policy.js';
|
||||
import { asRecord } from '@sammo-ts/common';
|
||||
import { AUDIT_POLICY_AREAS, auditPolicyHash, type PendingAuditPolicy } from './policy.js';
|
||||
import type { InMemoryTurnWorld } from '../turn/inMemoryWorld.js';
|
||||
|
||||
export const persistAuditPolicies = async (
|
||||
tx: GamePrisma.TransactionClient,
|
||||
@@ -43,3 +45,48 @@ export const persistAuditPolicies = async (
|
||||
throw new Error('Play audit policy replay payload conflict');
|
||||
}
|
||||
};
|
||||
|
||||
/** 원장은 그대로 두고, 구버전 NPC 생성이 유실한 head projection만 복구한다. */
|
||||
export const restoreMissingAuditPolicyHeads = async (
|
||||
tx: GamePrisma.TransactionClient,
|
||||
world: InMemoryTurnWorld
|
||||
): Promise<boolean> => {
|
||||
const serverId = world.getState().meta.serverId;
|
||||
if (typeof serverId !== 'string' || !serverId.trim()) return false;
|
||||
const missing = world.listNations().flatMap((nation) => {
|
||||
const heads = asRecord(nation.meta._playAuditPolicy);
|
||||
return AUDIT_POLICY_AREAS.filter((area) => heads[area] === undefined).map(
|
||||
(area) => GamePrisma.sql`(nation_id = ${nation.id} AND area = ${area})`
|
||||
);
|
||||
});
|
||||
if (!missing.length) return false;
|
||||
// DISTINCT ON으로 각 국가/영역의 마지막 revision만 읽는다. 과거 기수는 복구하지 않는다.
|
||||
const rows = await tx.$queryRaw<
|
||||
{ id: string; nationId: number; area: string; revision: number; after: InputJsonValue }[]
|
||||
>(GamePrisma.sql`
|
||||
SELECT DISTINCT ON (nation_id, area)
|
||||
id, nation_id AS "nationId", area, revision, "after"
|
||||
FROM play_audit_policy
|
||||
WHERE server_id = ${serverId} AND (${GamePrisma.join(missing, ' OR ')})
|
||||
ORDER BY nation_id, area, revision DESC
|
||||
`);
|
||||
for (const row of rows) {
|
||||
if (row.revision < 1 || row.id !== auditPolicyHash([serverId, row.nationId, row.area, row.revision])) {
|
||||
throw new Error('Invalid persisted play audit policy head');
|
||||
}
|
||||
const nation = world.getNationById(row.nationId)!;
|
||||
const heads = nation.meta._playAuditPolicy;
|
||||
world.updateNation(nation.id, {
|
||||
meta: {
|
||||
...nation.meta,
|
||||
_playAuditPolicy: {
|
||||
...(heads && typeof heads === 'object' && !Array.isArray(heads) ? heads : {}),
|
||||
[row.area]: { id: row.id, revision: row.revision, hash: auditPolicyHash(row.after), serverId },
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
// 실제 정책이 원장 after와 다르면 후속 initializeAuditPolicies가 OBSERVED_GAP을 남긴다.
|
||||
// 이 메타데이터와 새 이력은 기존 lease/fencing을 거친 startup flush에서 함께 commit된다.
|
||||
return rows.length > 0;
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { persistAuditDecisions } from '../playAudit/decisionPersistence.js';
|
||||
import { persistAuditDiplomacyEvents } from '@sammo-ts/infra';
|
||||
import { hasAuditDocumentBaseline, persistAuditDocumentBaseline } from '../playAudit/documentBaseline.js';
|
||||
import { persistAuditPolicies } from '../playAudit/policyPersistence.js';
|
||||
import { persistAuditPolicies, restoreMissingAuditPolicyHeads } from '../playAudit/policyPersistence.js';
|
||||
import { prunePreviousAuditBatch, type AuditRetentionResult } from '../playAudit/retention.js';
|
||||
import { persistAuditMonth } from '../playAudit/persistence.js';
|
||||
import { persistGeneralAccessScores, persistGeneralUpdates } from './generalBatchPersistence.js';
|
||||
@@ -78,6 +78,7 @@ import { prepareRealtimeRecovery } from './prepareRealtimeRecovery.js';
|
||||
export interface DatabaseTurnHooks {
|
||||
hooks: TurnDaemonHooks;
|
||||
flushChanges(): Promise<void>;
|
||||
restoreMissingAuditPolicyHeads(): Promise<boolean>;
|
||||
flushInitialAudit(observedAt: Date, force?: boolean): Promise<void>;
|
||||
takeCommittedReadModelChanges(): RealtimeReadModelChanges | null;
|
||||
takeCommittedReadModelChangeReceipt(): CommittedReadModelChangeReceipt | null;
|
||||
@@ -2164,6 +2165,7 @@ export const createDatabaseTurnHooks = async (
|
||||
hooks,
|
||||
flushChanges,
|
||||
flushInitialAudit,
|
||||
restoreMissingAuditPolicyHeads: () => restoreMissingAuditPolicyHeads(prisma, world),
|
||||
takeCommittedReadModelChanges: () => {
|
||||
return takeCommittedReceipt()?.changes ?? null;
|
||||
},
|
||||
|
||||
@@ -396,7 +396,8 @@ export const createRaiseInvaderHandler = (options: {
|
||||
}
|
||||
world.updateNation(nationId, {
|
||||
chiefGeneralId: ruler.id,
|
||||
meta: { ...nation.meta, gennum: npcEachCount },
|
||||
// addNation이 붙인 감사 이력 head를 오래된 생성 객체로 덮어쓰지 않는다.
|
||||
meta: { ...world.getNationById(nationId)!.meta, gennum: npcEachCount },
|
||||
});
|
||||
for (const officerLevel of [12, 11, 10, 9]) {
|
||||
options.reservedTurns.ensureNationTurns(nationId, officerLevel);
|
||||
|
||||
@@ -395,7 +395,8 @@ export const createRaiseNpcNationHandler = (options: {
|
||||
}
|
||||
world.updateNation(nationId, {
|
||||
chiefGeneralId: ruler.id,
|
||||
meta: { ...nation.meta, gennum: 1 + subordinateCandidates.length },
|
||||
// addNation이 붙인 감사 이력 head를 오래된 생성 객체로 덮어쓰지 않는다.
|
||||
meta: { ...world.getNationById(nationId)!.meta, gennum: 1 + subordinateCandidates.length },
|
||||
});
|
||||
options.reservedTurns.ensureNationTurns(nationId, 12);
|
||||
options.reservedTurns.ensureNationTurns(nationId, 11);
|
||||
|
||||
@@ -937,10 +937,11 @@ const createTurnDaemonRuntimeWithLease = async (
|
||||
await dbHooks.prepareRealtimeRecovery({ paused: await gatewayGate?.shouldPause() });
|
||||
// 복구된 clock에서 기준을 고정하고 readiness 공개 전에 원자적으로 저장한다.
|
||||
// 명령 없는 PREOPEN도 기록하며 input_event나 게임 RNG를 만들지 않는다.
|
||||
const policyHeadsRestored = await dbHooks.restoreMissingAuditPolicyHeads();
|
||||
initializeAuditPolicies(world);
|
||||
const diplomacyInitialized = initializeAuditDiplomacy(world, new Date(clock.nowMs()));
|
||||
initializeAuditCollection(world, new Date(clock.nowMs()));
|
||||
await dbHooks.flushInitialAudit(new Date(clock.nowMs()), diplomacyInitialized);
|
||||
await dbHooks.flushInitialAudit(new Date(clock.nowMs()), diplomacyInitialized || policyHeadsRestored);
|
||||
dbHooks.takeCommittedReadModelChangeReceipt();
|
||||
} catch (error) {
|
||||
await Promise.allSettled([
|
||||
|
||||
Reference in New Issue
Block a user