From f748de9567ed1ecebea0ee35e9c71f8ea0e2d450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 7 Nov 2023 13:56:01 +0100
Subject: [PATCH] fix(core): Ensure pruning starts only after migrations have
 completed (#7626)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://linear.app/n8n/issue/PAY-986/bug-execution-pruning-timer-is-started-before-the-database-is-ready

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/cli/src/Db.ts                       |  5 -----
 packages/cli/src/commands/start.ts           | 13 ++++++++++---
 packages/cli/src/services/pruning.service.ts |  3 +++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 2b5432a23..daebfa031 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -41,7 +41,6 @@ import {
 	WorkflowStatisticsRepository,
 	WorkflowTagMappingRepository,
 } from '@db/repositories';
-import { PruningService } from '@/services/pruning.service';
 
 export const collections = {} as IDatabaseCollections;
 
@@ -192,10 +191,6 @@ export async function init(testConnectionOptions?: ConnectionOptions): Promise<v
 	collections.Settings = Container.get(SettingsRepository);
 	collections.Credentials = Container.get(CredentialsRepository);
 	collections.Workflow = Container.get(WorkflowRepository);
-
-	const pruningService = Container.get(PruningService);
-
-	if (await pruningService.isPruningEnabled()) pruningService.startPruning();
 }
 
 export async function migrate() {
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 432135f8f..676e91cc8 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -65,6 +65,8 @@ export class Start extends BaseCommand {
 
 	protected server = new Server();
 
+	private pruningService: PruningService;
+
 	constructor(argv: string[], cmdConfig: IConfig) {
 		super(argv, cmdConfig);
 		this.setInstanceType('main');
@@ -110,9 +112,9 @@ export class Start extends BaseCommand {
 			// Note: While this saves a new license cert to DB, the previous entitlements are still kept in memory so that the shutdown process can complete
 			await Container.get(License).shutdown();
 
-			const pruningService = Container.get(PruningService);
-
-			if (await pruningService.isPruningEnabled()) await pruningService.stopPruning();
+			if (await this.pruningService.isPruningEnabled()) {
+				await this.pruningService.stopPruning();
+			}
 
 			if (config.getEnv('leaderSelection.enabled')) {
 				const { MultiMainInstancePublisher } = await import(
@@ -342,6 +344,11 @@ export class Start extends BaseCommand {
 
 		await this.server.start();
 
+		this.pruningService = Container.get(PruningService);
+		if (await this.pruningService.isPruningEnabled()) {
+			this.pruningService.startPruning();
+		}
+
 		// Start to get active workflows and run their triggers
 		await this.activeWorkflowRunner.init();
 
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
index c5435e637..96bed6392 100644
--- a/packages/cli/src/services/pruning.service.ts
+++ b/packages/cli/src/services/pruning.service.ts
@@ -56,6 +56,9 @@ export class PruningService {
 		return true;
 	}
 
+	/**
+	 * @important Call only after DB connection is established and migrations have completed.
+	 */
 	startPruning() {
 		this.setSoftDeletionInterval();
 		this.scheduleHardDeletion();