PR comments

broadinstitute · Mar 23, 2017 · ee36f69 · ee36f69
1 parent 815045e
commit ee36f69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/backend/src/main/scala/cromwell/backend/async/AsyncBackendJobExecutionActor.scala b/backend/src/main/scala/cromwell/backend/async/AsyncBackendJobExecutionActor.scala
@@ -53,11 +53,10 @@ trait AsyncBackendJobExecutionActor { this: Actor with ActorLogging =>
   }
 
   private def robustExecuteOrRecover(mode: ExecutionMode) = {
-//    withRetry(() => executeOrRecover(mode), executeOrRecoverBackOff) onComplete {
-//      case Success(h) => self ! IssuePollRequest(h)
-//      case Failure(t) => self ! FailAndStop(t)
-//    }
-    self ! PollResponseReceived(SuccessfulExecutionHandle(Map.empty, 0, Map.empty, Seq.empty, None))
+    withRetry(() => executeOrRecover(mode), executeOrRecoverBackOff) onComplete {
+      case Success(h) => self ! IssuePollRequest(h)
+      case Failure(t) => self ! FailAndStop(t)
+    }
   }
 
   def pollBackOff: SimpleExponentialBackoff

diff --git a/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/ExecutionStore.scala b/engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/ExecutionStore.scala
@@ -77,8 +77,7 @@ final case class ExecutionStore(private val statusStore: Map[JobKey, ExecutionSt
   def runnableScopes = keysWithStatus(NotStarted) filter arePrerequisitesDone(doneKeys)
 
   def findCompletedShardsForOutput(key: CollectorKey): List[JobKey] = doneKeys collect {
-    case k: CallKey if k.scope == key.scope && k.isShard => k
-    case k: DynamicDeclarationKey if k.scope == key.scope && k.isShard => k
+    case k @ (_: CallKey | _:DynamicDeclarationKey) if k.scope == key.scope && k.isShard => k
   }
 
   // Just used to decide whether a collector can be run. In case the shard entries haven't been populated into the