fix(core): Make execution and its data creation atomic (#10276)
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
@@ -270,17 +270,27 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
|
||||
return rest;
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a new execution and its execution data using a transaction.
|
||||
*/
|
||||
async createNewExecution(execution: ExecutionPayload): Promise<string> {
|
||||
const { data, workflowData, ...rest } = execution;
|
||||
const { identifiers: inserted } = await this.insert(rest);
|
||||
const { id: executionId } = inserted[0] as { id: string };
|
||||
const { connections, nodes, name, settings } = workflowData ?? {};
|
||||
await this.executionDataRepository.insert({
|
||||
executionId,
|
||||
workflowData: { connections, nodes, name, settings, id: workflowData.id },
|
||||
data: stringify(data),
|
||||
return await this.manager.transaction(async (transactionManager) => {
|
||||
const { data, workflowData, ...rest } = execution;
|
||||
const insertResult = await transactionManager.insert(ExecutionEntity, rest);
|
||||
const { id: executionId } = insertResult.identifiers[0] as { id: string };
|
||||
|
||||
const { connections, nodes, name, settings } = workflowData ?? {};
|
||||
await this.executionDataRepository.createExecutionDataForExecution(
|
||||
{
|
||||
executionId,
|
||||
workflowData: { connections, nodes, name, settings, id: workflowData.id },
|
||||
data: stringify(data),
|
||||
},
|
||||
transactionManager,
|
||||
);
|
||||
|
||||
return String(executionId);
|
||||
});
|
||||
return String(executionId);
|
||||
}
|
||||
|
||||
async markAsCrashed(executionIds: string | string[]) {
|
||||
|
||||
@@ -1,13 +1,32 @@
|
||||
import { Service } from 'typedi';
|
||||
import type { EntityManager } from '@n8n/typeorm';
|
||||
import type { IWorkflowBase } from 'n8n-workflow';
|
||||
import { DataSource, In, Repository } from '@n8n/typeorm';
|
||||
import { ExecutionData } from '../entities/ExecutionData';
|
||||
|
||||
export interface CreateExecutionDataOpts extends Pick<ExecutionData, 'data' | 'executionId'> {
|
||||
workflowData: Pick<IWorkflowBase, 'connections' | 'nodes' | 'name' | 'settings' | 'id'>;
|
||||
}
|
||||
|
||||
@Service()
|
||||
export class ExecutionDataRepository extends Repository<ExecutionData> {
|
||||
constructor(dataSource: DataSource) {
|
||||
super(ExecutionData, dataSource.manager);
|
||||
}
|
||||
|
||||
async createExecutionDataForExecution(
|
||||
executionData: CreateExecutionDataOpts,
|
||||
transactionManager: EntityManager,
|
||||
) {
|
||||
const { data, executionId, workflowData } = executionData;
|
||||
|
||||
return await transactionManager.insert(ExecutionData, {
|
||||
executionId,
|
||||
data,
|
||||
workflowData,
|
||||
});
|
||||
}
|
||||
|
||||
async findByExecutionIds(executionIds: string[]) {
|
||||
return await this.find({
|
||||
select: ['workflowData'],
|
||||
|
||||
Reference in New Issue
Block a user