Skip to content

Commit

Permalink
AN-292 GCP Batch Removed Unused SSH Runnable (#7587)
Browse files Browse the repository at this point in the history
  • Loading branch information
dspeck1 authored Nov 22, 2024
1 parent cd05fa2 commit 42c41bd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe
val monitoringShutdown: List[Runnable] = monitoringShutdownRunnables(createParameters)
val checkpointingStart: List[Runnable] = checkpointingSetupRunnables(createParameters, allVolumes)
val checkpointingShutdown: List[Runnable] = checkpointingShutdownRunnables(createParameters, allVolumes)
val sshAccess: List[Runnable] = List.empty // sshAccessActions(createPipelineParameters, mounts)

val sortedRunnables: List[Runnable] = RunnableUtils.sortRunnables(
containerSetup = containerSetup,
Expand All @@ -243,7 +242,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe
monitoringShutdown = monitoringShutdown,
checkpointingStart = checkpointingStart,
checkpointingShutdown = checkpointingShutdown,
sshAccess = sshAccess,
isBackground = _.getBackground
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ object RunnableUtils {
monitoringShutdown: List[Runnable],
checkpointingStart: List[Runnable],
checkpointingShutdown: List[Runnable],
sshAccess: List[Runnable],
isBackground: Runnable => Boolean
): List[Runnable] = {
val toBeSortedRunnables = localization ++ userRunnable ++ memoryRetryRunnable ++ deLocalization
val sortedRunnables = toBeSortedRunnables.sortWith { case (runnable, _) =>
isBackground(runnable)
}

sshAccess ++ containerSetup ++ monitoringSetup ++ checkpointingStart ++ sortedRunnables ++ checkpointingShutdown ++ monitoringShutdown
containerSetup ++ monitoringSetup ++ checkpointingStart ++ sortedRunnables ++ checkpointingShutdown ++ monitoringShutdown
}
}

0 comments on commit 42c41bd

Please sign in to comment.