Scala pedantry

broadinstitute · Jan 30, 2025 · 507ce25 · 507ce25
1 parent 7b35963
commit 507ce25
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/...in/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala b/...in/scala/cromwell/backend/google/batch/actors/GcpBatchAsyncBackendJobExecutionActor.scala
@@ -1083,26 +1083,28 @@ class GcpBatchAsyncBackendJobExecutionActor(override val standardParams: Standar
 
   // returnCode is provided by cromwell, so far, this is empty for all the tests I ran
   override def handleExecutionFailure(runStatus: RunStatus, returnCode: Option[Int]): Future[ExecutionHandle] = {
-    def handleFailedRunStatus(runStatus: RunStatus.UnsuccessfulRunStatus): ExecutionHandle =
-      if (runStatus.exitCode == Some(GcpBatchExitCode.VMPreemption)) {
-        FailedRetryableExecutionHandle(
-          StandardException(message = runStatus.prettyPrintedError, jobTag = jobTag),
-          returnCode,
-          Option(
-            Seq(
-              KvPair(ScopedKey(workflowId, futureKvJobKey, GcpBatchBackendLifecycleActorFactory.preemptionCountKey),
-                     "0"
+    def handleFailedRunStatus(runStatus: RunStatus.UnsuccessfulRunStatus): ExecutionHandle = {
+      runStatus.exitCode match {
+        case Some(GcpBatchExitCode.VMPreemption) =>
+          FailedRetryableExecutionHandle(
+            StandardException(message = runStatus.prettyPrintedError, jobTag = jobTag),
+            returnCode,
+            Option(
+              Seq(
+                KvPair(ScopedKey(workflowId, futureKvJobKey, GcpBatchBackendLifecycleActorFactory.preemptionCountKey),
+                  "0"
+                )
               )
             )
           )
-        )
-      } else {
-        FailedNonRetryableExecutionHandle(
-          StandardException(message = runStatus.prettyPrintedError, jobTag = jobTag),
-          returnCode,
-          None
-        )
+        case _ =>
+          FailedNonRetryableExecutionHandle(
+            StandardException(message = runStatus.prettyPrintedError, jobTag = jobTag),
+            returnCode,
+            None
+          )
       }
+    }
 
     Future.fromTry {
       Try {