mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 12:44:07 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(core): Include logless case in crash recovery (no-changelog) (#9725)

Browse source
This commit is contained in:
Iván Ovejero 2024-06-13 12:54:51 +02:00 committed by GitHub
parent 28d1a5d00d
commit cfef49e60a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 227 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/cli/src/databases/repositories/execution.repository.ts
View file

@ -260,7 +260,9 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
return String(executionId);
}
async markAsCrashed(executionIds: string[]) {
async markAsCrashed(executionIds: string | string[]) {
if (!Array.isArray(executionIds)) executionIds = [executionIds];
await this.update(
{ id: In(executionIds) },
{
@ -268,6 +270,10 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
stoppedAt: new Date(),
},
);
this.logger.info('[Execution Recovery] Marked executions as `crashed`', {
executionIds,
});
}
/**

16
packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
View file

@ -175,18 +175,8 @@ export class MessageEventBus extends EventEmitter {
// start actual recovery process and write recovery process flag file
this.logWriter?.startRecoveryProcess();
for (const executionId of unfinishedExecutionIds) {
this.logger.warn(`Attempting to recover execution ${executionId}`);
if (!unsentAndUnfinished.unfinishedExecutions[executionId]?.length) {
this.logger.debug(
`No event messages found, marking execution ${executionId} as 'crashed'`,
);
await this.executionRepository.markAsCrashed([executionId]);
} else {
await this.recoveryService.recover(
executionId,
unsentAndUnfinished.unfinishedExecutions[executionId],
);
}
const logMesssages = unsentAndUnfinished.unfinishedExecutions[executionId];
await this.recoveryService.recoverFromLogs(executionId, logMesssages ?? []);
}
}
// remove the recovery process flag file
@ -367,7 +357,7 @@ export class MessageEventBus extends EventEmitter {
async getUnsentAndUnfinishedExecutions(): Promise<{
unsentMessages: EventMessageTypes[];
unfinishedExecutions: Record<string, EventMessageTypes[]>;
unfinishedExecutions: Record<string, EventMessageTypes[] | undefined>;
}> {
const queryResult = await this.logWriter?.getUnsentAndUnfinishedExecutions();
return queryResult;

162
packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
View file

@ -174,17 +174,15 @@ export const setupMessages = (executionId: string, workflowName: string): EventM
describe('ExecutionRecoveryService', () => {
let executionRecoveryService: ExecutionRecoveryService;
let push: Push;
let executionRepository: ExecutionRepository;
beforeAll(async () => {
await testDb.init();
mockInstance(InternalHooks);
push = mockInstance(Push);
executionRecoveryService = new ExecutionRecoveryService(
push,
Container.get(ExecutionRepository),
);
executionRepository = Container.get(ExecutionRepository);
executionRecoveryService = new ExecutionRecoveryService(push, executionRepository);
});
afterEach(async () => {
@ -195,48 +193,80 @@ describe('ExecutionRecoveryService', () => {
await testDb.terminate();
});
describe('recover', () => {
it('should amend, persist, run hooks, broadcast', async () => {
describe('recoverFromLogs', () => {
describe('if no messages', () => {
test('should return `null` if no execution found', async () => {
/**
* Arrange
*/
// @ts-expect-error Private method
const amendSpy = jest.spyOn(executionRecoveryService, 'amend');
const executionRepository = Container.get(ExecutionRepository);
const dbUpdateSpy = jest.spyOn(executionRepository, 'update');
// @ts-expect-error Private method
const runHooksSpy = jest.spyOn(executionRecoveryService, 'runHooks');
const workflow = await createWorkflow(OOM_WORKFLOW);
const execution = await createExecution(
{
status: 'running',
data: stringify(IN_PROGRESS_EXECUTION_DATA),
},
workflow,
);
const messages = setupMessages(execution.id, workflow.name);
const inexistentExecutionId = randomInteger(100).toString();
const noMessages: EventMessage[] = [];
/**
* Act
*/
await executionRecoveryService.recover(execution.id, messages);
const amendedExecution = await executionRecoveryService.recoverFromLogs(
inexistentExecutionId,
noMessages,
);
/**
* Assert
*/
expect(amendSpy).toHaveBeenCalledTimes(1);
expect(amendSpy).toHaveBeenCalledWith(execution.id, messages);
expect(dbUpdateSpy).toHaveBeenCalledTimes(1);
expect(runHooksSpy).toHaveBeenCalledTimes(1);
expect(push.once).toHaveBeenCalledTimes(1);
expect(amendedExecution).toBeNull();
});
test('should amend a truncated execution where last node did not finish', async () => {
test('should update `status` and `stoppedAt`', async () => {
/**
* Arrange
*/
const workflow = await createWorkflow(OOM_WORKFLOW);
const execution = await createExecution(
{
status: 'running',
data: stringify(IN_PROGRESS_EXECUTION_DATA),
},
workflow,
);
/**
* Act
*/
const amendedExecution = await executionRecoveryService.recoverFromLogs(execution.id, []);
/**
* Assert
*/
if (!amendedExecution) fail('Expected `amendedExecution` to exist');
expect(amendedExecution.status).toBe('crashed');
expect(amendedExecution.stoppedAt).not.toBe(execution.stoppedAt);
});
});
describe('if messages', () => {
test('should return `null` if no execution found', async () => {
/**
* Arrange
*/
const inexistentExecutionId = randomInteger(100).toString();
const messages = setupMessages(inexistentExecutionId, 'Some workflow');
/**
* Act
*/
const amendedExecution = await executionRecoveryService.recoverFromLogs(
inexistentExecutionId,
messages,
);
/**
* Assert
*/
expect(amendedExecution).toBeNull();
});
test('should update `status`, `stoppedAt` and `data` if last node did not finish', async () => {
/**
* Arrange
*/
@ -257,7 +287,10 @@ describe('ExecutionRecoveryService', () => {
* Act
*/
const amendedExecution = await executionRecoveryService.recover(execution.id, messages);
const amendedExecution = await executionRecoveryService.recoverFromLogs(
execution.id,
messages,
);
/**
* Assert
@ -296,11 +329,10 @@ describe('ExecutionRecoveryService', () => {
expect(debugHelperTaskData?.error).toBeInstanceOf(NodeCrashedError);
});
test('should amend a truncated execution where last node finished', async () => {
test('should update `status`, `stoppedAt` and `data` if last node finished', async () => {
/**
* Arrange
*/
const workflow = await createWorkflow(OOM_WORKFLOW);
const execution = await createExecution(
@ -327,13 +359,14 @@ describe('ExecutionRecoveryService', () => {
/**
* Act
*/
const amendedExecution = await executionRecoveryService.recover(execution.id, messages);
const amendedExecution = await executionRecoveryService.recoverFromLogs(
execution.id,
messages,
);
/**
* Assert
*/
const endOfLastNoderun = messages
.find((m) => m.eventName === 'n8n.node.finished' && m.payload.nodeName === 'DebugHelper')
?.ts.toJSDate();
@ -366,55 +399,6 @@ describe('ExecutionRecoveryService', () => {
expect(debugHelperTaskData?.error).toBeUndefined();
expect(debugHelperTaskData?.data).toEqual(ARTIFICIAL_TASK_DATA);
});
test('should return `null` if no messages', async () => {
/**
* Arrange
*/
const workflow = await createWorkflow(OOM_WORKFLOW);
const execution = await createExecution(
{
status: 'running',
data: stringify(IN_PROGRESS_EXECUTION_DATA),
},
workflow,
);
const noMessages: EventMessage[] = [];
/**
* Act
*/
const amendedExecution = await executionRecoveryService.recover(execution.id, noMessages);
/**
* Assert
*/
expect(amendedExecution).toBeNull();
});
test('should return `null` if no execution', async () => {
/**
* Arrange
*/
const inexistentExecutionId = randomInteger(100).toString();
const messages = setupMessages(inexistentExecutionId, 'Some workflow');
/**
* Act
*/
const amendedExecution = await executionRecoveryService.recover(
inexistentExecutionId,
messages,
);
/**
* Assert
*/
expect(amendedExecution).toBeNull();
});
});
});

44
packages/cli/src/executions/execution-recovery.service.ts
View file

@ -13,7 +13,7 @@ import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
import { ARTIFICIAL_TASK_DATA } from '@/constants';
/**
* Service for recovering executions truncated by an instance crash.
* Service for recovering key properties in executions.
*/
@Service()
export class ExecutionRecoveryService {
@ -23,20 +23,9 @@ export class ExecutionRecoveryService {
) {}
/**
* "Recovery" means (1) amending key properties of a truncated execution,
* (2) running post-execution hooks, and (3) returning the amended execution
* so the UI can reflect the error. "Recovery" does **not** mean injecting
* execution data from the logs (they hold none), or resuming the execution
* from the point of truncation, or re-running the whole execution.
*
* Recovery is only possible if event logs are available in the container.
* In regular mode, logs should but might not be available, e.g. due to container
* being recycled, max log size causing rotation, etc. In queue mode, as workers
* log to their own filesystems, only manual exections can be recovered.
* Recover key properties of a truncated execution using event logs.
*/
async recover(executionId: string, messages: EventMessageTypes[]) {
if (messages.length === 0) return null;
async recoverFromLogs(executionId: string, messages: EventMessageTypes[]) {
const amendedExecution = await this.amend(executionId, messages);
if (!amendedExecution) return null;
@ -53,10 +42,16 @@ export class ExecutionRecoveryService {
return amendedExecution;
}
// ----------------------------------
// private
// ----------------------------------
/**
* Amend `status`, `stoppedAt`, and `data` of an execution using event log messages.
* Amend `status`, `stoppedAt`, and (if possible) `data` properties of an execution.
*/
private async amend(executionId: string, messages: EventMessageTypes[]) {
if (messages.length === 0) return await this.amendWithoutLogs(executionId);
const { nodeMessages, workflowMessages } = this.toRelevantMessages(messages);
if (nodeMessages.length === 0) return null;
@ -114,9 +109,20 @@ export class ExecutionRecoveryService {
} as IExecutionResponse;
}
// ----------------------------------
// private
// ----------------------------------
private async amendWithoutLogs(executionId: string) {
const exists = await this.executionRepository.exists({ where: { id: executionId } });
if (!exists) return null;
await this.executionRepository.markAsCrashed(executionId);
const execution = await this.executionRepository.findSingleExecution(executionId, {
includeData: true,
unflattenData: true,
});
return execution ?? null;
}
private toRelevantMessages(messages: EventMessageTypes[]) {
return messages.reduce<{
@ -152,6 +158,8 @@ export class ExecutionRecoveryService {
}
private async runHooks(execution: IExecutionResponse) {
execution.data ??= { resultData: { runData: {} } };
await Container.get(InternalHooks).onWorkflowPostExecute(execution.id, execution.workflowData, {
data: execution.data,
finished: false,