Fix autoscaled job metric loop

shopstic · Apr 29, 2024 · e51394c · e51394c
1 parent 8752714
commit e51394c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/apps/k8s_job_autoscaler/libs/autoscaled_job.ts b/src/apps/k8s_job_autoscaler/libs/autoscaled_job.ts
@@ -44,19 +44,18 @@ export async function* watchMetric(
         pending: pendingValue ? Number(pendingValue) : 0,
         inProgress: inProgressMetric ? (inProgressValue ? Number(inProgressValue) : 0) : null,
       };
-
+    } catch (error) {
+      if (!(error instanceof DOMException) || error.name !== "AbortError") {
+        logger.error({ msg: "Metric query failed", error });
+      }
+    } finally {
       const now = performance.now();
       const elapseMs = now - last;
 
       const toDelayMs = Math.max(maxDelayMs - elapseMs, 0);
       if (toDelayMs > 0) {
-        await delay(toDelayMs);
+        await delay(toDelayMs, { signal });
       }
-    } catch (error) {
-      if (!(error instanceof DOMException) || error.name !== "AbortError") {
-        logger.error({ msg: "Metric query failed", error });
-      }
-    } finally {
       last = performance.now();
     }
   }