mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Fix issue where sub workflows would display as running forever after failure to start (#5905)

Browse source 
* fixed recovery / status for early return in main mode

* mark non-data returning executions in own mode as failed

* improve error handling
This commit is contained in:
Michael Auerswald 2023-04-06 11:36:11 +02:00 committed by GitHub
parent 2881ee9ecc
commit 3e382ef85e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/cli/src/WorkflowExecuteAdditionalData.ts
View file

@ -638,7 +638,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
}; };
if (this.retryOf !== undefined) { if (this.retryOf !== undefined) {
fullExecutionData.retryOf = this.retryOf.toString(); fullExecutionData.retryOf = this.retryOf?.toString();
} }
const workflowId = this.workflowData.id; const workflowId = this.workflowData.id;
@ -1054,7 +1054,7 @@ async function executeWorkflow(
mode: 'integrated', mode: 'integrated',
startedAt: new Date(), startedAt: new Date(),
stoppedAt: new Date(), stoppedAt: new Date(),
status: 'error', status: 'failed',
}; };
// When failing, we might not have finished the execution // When failing, we might not have finished the execution
// Therefore, database might not contain finished errors. // Therefore, database might not contain finished errors.
@ -1073,6 +1073,9 @@ async function executeWorkflow(
fullExecutionData.workflowId = workflowData.id; fullExecutionData.workflowId = workflowData.id;
} }
// remove execution from active executions
Container.get(ActiveExecutions).remove(executionId, fullRunData);
const executionData = ResponseHelper.flattenExecutionData(fullExecutionData); const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
await Db.collections.Execution.update(executionId, executionData as IExecutionFlattedDb); await Db.collections.Execution.update(executionId, executionData as IExecutionFlattedDb);

16
packages/cli/src/WorkflowRunner.ts
View file

@ -744,9 +744,23 @@ export class WorkflowRunner {
childExecutionIds.splice(executionIdIndex, 1); childExecutionIds.splice(executionIdIndex, 1);
} }
// eslint-disable-next-line @typescript-eslint/await-thenable if (message.data.result === undefined) {
const noDataError = new WorkflowOperationError('Workflow finished with no result data');
const subWorkflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(
data,
message.data.executionId,
);
await this.processError(
noDataError,
startedAt,
data.executionMode,
message.data?.executionId,
subWorkflowHooks,
);
} else {
this.activeExecutions.remove(message.data.executionId, message.data.result); this.activeExecutions.remove(message.data.executionId, message.data.result);
} }
}
}); });
// Also get informed when the processes does exit especially when it did crash or timed out // Also get informed when the processes does exit especially when it did crash or timed out

7
packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
View file

@ -155,9 +155,10 @@ export async function recoverExecutionDataFromEventLogMessages(
} }
if (applyToDb) { if (applyToDb) {
const newStatus = executionEntry.status === 'failed' ? 'failed' : 'crashed';
await Db.collections.Execution.update(executionId, { await Db.collections.Execution.update(executionId, {
data: stringify(executionData), data: stringify(executionData),
status: 'crashed', status: newStatus,
stoppedAt: lastNodeRunTimestamp?.toJSDate(), stoppedAt: lastNodeRunTimestamp?.toJSDate(),
}); });
await Container.get(InternalHooks).onWorkflowPostExecute( await Container.get(InternalHooks).onWorkflowPostExecute(
@ -170,7 +171,7 @@ export async function recoverExecutionDataFromEventLogMessages(
waitTill: executionEntry.waitTill ?? undefined, waitTill: executionEntry.waitTill ?? undefined,
startedAt: executionEntry.startedAt, startedAt: executionEntry.startedAt,
stoppedAt: lastNodeRunTimestamp?.toJSDate(), stoppedAt: lastNodeRunTimestamp?.toJSDate(),
status: 'crashed', status: newStatus,
}, },
); );
const iRunData: IRun = { const iRunData: IRun = {
@ -180,7 +181,7 @@ export async function recoverExecutionDataFromEventLogMessages(
waitTill: executionEntry.waitTill ?? undefined, waitTill: executionEntry.waitTill ?? undefined,
startedAt: executionEntry.startedAt, startedAt: executionEntry.startedAt,
stoppedAt: lastNodeRunTimestamp?.toJSDate(), stoppedAt: lastNodeRunTimestamp?.toJSDate(),
status: 'crashed', status: newStatus,
}; };
const workflowHooks = getWorkflowHooksMain( const workflowHooks = getWorkflowHooksMain(
{ {