From ddc598a6ccc021665153853142fd19eec35673c0 Mon Sep 17 00:00:00 2001 From: Alexis Varsava Date: Tue, 7 May 2024 17:19:46 -0400 Subject: [PATCH] It is correct for a WAITING_FOR_RESOURCES job to have no active operations This commit reverts 11dc61aed5fc3815b3fba338f000ccdfa8e1e4c8 and c6562167f3ca5248d36f79ce6ab4d416c16b7ee4 --- changes/fix_fix-bad-recovery.md | 2 ++ .../oicr/gsi/vidarr/server/DatabaseBackedProcessor.java | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 changes/fix_fix-bad-recovery.md diff --git a/changes/fix_fix-bad-recovery.md b/changes/fix_fix-bad-recovery.md new file mode 100644 index 00000000..a66245b2 --- /dev/null +++ b/changes/fix_fix-bad-recovery.md @@ -0,0 +1,2 @@ +Fix broken recovery logic present from v0.19.0 + diff --git a/vidarr-server/src/main/java/ca/on/oicr/gsi/vidarr/server/DatabaseBackedProcessor.java b/vidarr-server/src/main/java/ca/on/oicr/gsi/vidarr/server/DatabaseBackedProcessor.java index 60963baa..4263ab39 100644 --- a/vidarr-server/src/main/java/ca/on/oicr/gsi/vidarr/server/DatabaseBackedProcessor.java +++ b/vidarr-server/src/main/java/ca/on/oicr/gsi/vidarr/server/DatabaseBackedProcessor.java @@ -740,14 +740,6 @@ record -> final var activeOperations = operations.getOrDefault( record.get(ACTIVE_WORKFLOW_RUN.ID), List.of()); - if (activeOperations.isEmpty()) { - String erroneousHash = record.get(WORKFLOW_RUN.HASH_ID); - System.err.printf( - "Error recovering workflow run %s: no operations match\n", - erroneousHash); - BadRecoveryTracker.add(erroneousHash); - return; - } final var workflow = DatabaseWorkflow.recover( target,