Merge pull request #33481 from walsm232/fix/catalog-refresh-state-deadlock

fix(catalog): Fix catalog refresh_state deadlock when running multiple replicas
2026-03-24 14:21:18 +01:00
parent 7fc0daebd7 35f69e168c
commit 94a4037fcc
2 changed files with 12 additions and 4 deletions
@@ -142,10 +142,13 @@ export class DefaultCatalogProcessingEngine {
      pollingIntervalMs: this.pollingIntervalMs,
      loadTasks: async count => {
        try {
-          const { items } =
-            await this.processingDatabase.getProcessableEntities(this.knex, {
-              processBatchSize: count,
-            });
+          const { items } = await this.processingDatabase.transaction(
+            async tx => {
+              return this.processingDatabase.getProcessableEntities(tx, {
+                processBatchSize: count,
+              });
+            },
+          );
          return items;
        } catch (error) {
          this.logger.warn('Failed to load processing items', error);