Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): Fix calling error workflows in main mode recovery #5698

Merged
merged 6 commits into from
Mar 17, 2023
Merged

fix(core): Fix calling error workflows in main mode recovery #5698

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aec3b6
fix calling error workflows in main mode recovery
flipswitchingmonkey Mar 15, 2023
9caf1d6
cleanup
flipswitchingmonkey Mar 15, 2023
03e86a9
remove WorkflowExecuteAdditionalData export from index
flipswitchingmonkey Mar 16, 2023
693cc7f
revert refactor to fix test
flipswitchingmonkey Mar 17, 2023
f4daadc
Update index.ts
netroy Mar 17, 2023
33b2cad
Merge branch 'master' into pay-298-fix-triggering-of-error-workflows-in
flipswitchingmonkey Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
import { eventBus } from './MessageEventBus';
import { Container } from 'typedi';
import { InternalHooks } from '@/InternalHooks';
import { WorkflowExecuteAdditionalData } from '../..';
netroy marked this conversation as resolved.
Show resolved Hide resolved

export async function recoverExecutionDataFromEventLogMessages(
executionId: string,
Expand Down Expand Up @@ -122,9 +123,6 @@ export async function recoverExecutionDataFromEventLogMessages(
}
}

if (!executionData.resultData.error && workflowError) {
executionData.resultData.error = workflowError;
}
if (!lastNodeRunTimestamp) {
const workflowEndedMessage = messages.find((message) =>
(
Expand All @@ -138,6 +136,11 @@ export async function recoverExecutionDataFromEventLogMessages(
if (workflowEndedMessage) {
lastNodeRunTimestamp = workflowEndedMessage.ts;
} else {
if (!workflowError) {
workflowError = new WorkflowOperationError(
'Workflow did not finish, possible out-of-memory issue',
);
}
const workflowStartedMessage = messages.find(
(message) => message.eventName === 'n8n.workflow.started',
);
Expand All @@ -146,6 +149,11 @@ export async function recoverExecutionDataFromEventLogMessages(
}
}
}

if (!executionData.resultData.error && workflowError) {
executionData.resultData.error = workflowError;
}

if (applyToDb) {
await Db.collections.Execution.update(executionId, {
data: stringify(executionData),
Expand Down Expand Up @@ -174,6 +182,20 @@ export async function recoverExecutionDataFromEventLogMessages(
stoppedAt: lastNodeRunTimestamp?.toJSDate(),
status: 'crashed',
};
const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(
{
userId: '',
workflowData: executionEntry.workflowData,
executionMode: executionEntry.mode,
executionData,
runData: executionData.resultData.runData,
retryOf: executionEntry.retryOf,
},
executionId,
);

// execute workflowExecuteAfter hook to trigger error workflow
await workflowHooks.executeHookFunctions('workflowExecuteAfter', [iRunData]);

// calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point
await workflowExecutionCompleted(executionEntry.workflowData, iRunData);
Expand Down