Merge branch 'develop' into AN-142-cost-test

broadinstitute · Feb 12, 2025 · ca07382 · ca07382
2 parents 67ccddd + e5950a5
commit ca07382
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...batch/src/main/scala/cromwell/backend/google/batch/api/request/BatchRequestExecutor.scala b/...batch/src/main/scala/cromwell/backend/google/batch/api/request/BatchRequestExecutor.scala
@@ -28,8 +28,9 @@ trait BatchRequestExecutor {
 }
 
 object BatchRequestExecutor {
+  // The "from" state is *usually* RUNNING, but if a VM is quickly preempted it could be an earlier state like PENDING.
   private val VM_PREEMPTION_PATTERN = Pattern.compile(
-    "failed due to the following task event: \"Task state is updated from RUNNING to FAILED on zones/\\S+ due to Spot VM preemption with exit code 50001.\""
+    "failed due to the following task event: \"Task state is updated from \\S+ to FAILED on zones/\\S+ due to Spot VM preemption with exit code 50001.\""
   )
 
   class CloudImpl(batchSettings: BatchServiceSettings) extends BatchRequestExecutor with LazyLogging {