mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): Fix pruning of non-finished executions (#7333)

Browse Source 
This fixes a bug in the pruning (soft-delete). The pruning was a bit too
aggressive, as it also pruned executions that weren't in an end state
yet. This only becomes an issue if there are long-running executions
(e.g. workflow with Wait node) or the prune parameters are set to keep
only a tiny number of executions.
This commit is contained in:
Tomi Turtiainen
2023-10-04 16:32:05 +03:00
committed by GitHub
parent 942d0b91fc
commit 1b4848afcb
6 changed files with 251 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/cli/src/databases/repositories/execution.repository.ts
View File

@@ -1,5 +1,14 @@
import { Service } from 'typedi';
import { Brackets, DataSource, In, LessThanOrEqual, MoreThanOrEqual, Repository } from 'typeorm';
import {
Brackets,
DataSource,
Not,
In,
IsNull,
LessThanOrEqual,
MoreThanOrEqual,
Repository,
} from 'typeorm';
import { DateUtils } from 'typeorm/util/DateUtils';
import type {
FindManyOptions,
@@ -110,13 +119,21 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
}
setSoftDeletionInterval() {
this.logger.debug('Setting soft-deletion interval (pruning) for executions');
this.logger.debug(
`Setting soft-deletion interval (pruning) for executions every ${
this.rates.softDeletion / TIME.MINUTE
} min`,
);
this.intervals.softDeletion = setInterval(async () => this.prune(), this.rates.hardDeletion);
this.intervals.softDeletion = setInterval(async () => this.prune(), this.rates.softDeletion);
}
setHardDeletionInterval() {
this.logger.debug('Setting hard-deletion interval for executions');
this.logger.debug(
`Setting hard-deletion interval for executions every ${
this.rates.hardDeletion / TIME.MINUTE
} min`,
);
this.intervals.hardDeletion = setInterval(
async () => this.hardDelete(),
@@ -487,7 +504,12 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
await this.createQueryBuilder()
.update(ExecutionEntity)
.set({ deletedAt: new Date() })
.where(
.where({
deletedAt: IsNull(),
// Only mark executions as deleted if they are in an end state
status: Not(In(['new', 'running', 'waiting'])),
})
.andWhere(
new Brackets((qb) =>
countBasedWhere
? qb.where(timeBasedWhere).orWhere(countBasedWhere)