Merge 9e2bb71 into 697c137

broadinstitute · Apr 10, 2017 · a3121c9 · a3121c9
2 parents 697c137 + 9e2bb71
commit a3121c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/backend/src/main/scala/cromwell/backend/standard/StandardAsyncExecutionActor.scala b/backend/src/main/scala/cromwell/backend/standard/StandardAsyncExecutionActor.scala
@@ -16,6 +16,7 @@ import cromwell.core.{CallOutputs, CromwellAggregatedException, CromwellFatalExc
 import cromwell.services.keyvalue.KeyValueServiceActor._
 import cromwell.services.metadata.CallMetadataKeys
 import lenthall.util.TryUtil
+import net.ceedubs.ficus.Ficus._
 import wdl4s._
 import wdl4s.values.{WdlFile, WdlGlobFile, WdlSingleFile, WdlValue}
 
@@ -88,6 +89,8 @@ trait StandardAsyncExecutionActor extends AsyncBackendJobExecutionActor with Sta
   lazy val backendEngineFunctions: StandardExpressionFunctions =
     standardInitializationData.expressionFunctions(jobPaths)
 
+  lazy val scriptEpilogue = configurationDescriptor.backendConfig.as[Option[String]]("script-epilogue").getOrElse("sync")
+
   /**
     * Maps WdlFile objects for use in the commandLinePreProcessor.
     *
@@ -189,7 +192,7 @@ trait StandardAsyncExecutionActor extends AsyncBackendJobExecutionActor with Sta
         |cd $cwd
         |${globManipulations(globFiles)}
         |)
-        |sync
+        |$scriptEpilogue
         |mv $rcTmpPath $rcPath
         |""".stripMargin.replace("INSTANTIATED_COMMAND", instantiatedCommand)
   }

diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -177,6 +177,8 @@ backend {
         #concurrent-job-limit = 5
 
         run-in-background = true
+        # Configures any logic which should run after the command completes
+        # script-epilogue = ""
         runtime-attributes = """
         String? docker
         String? docker_user

diff --git a/src/bin/travis/resources/local_centaur.conf b/src/bin/travis/resources/local_centaur.conf
@@ -20,3 +20,4 @@ call-caching {
 backend.providers.Local.config.filesystems.local.caching.duplication-strategy = ["copy"]
 backend.providers.Local.config.filesystems.local.localization = ["soft-link", "copy"]
 backend.providers.Local.config.concurrent-job-limit = 20
+backend.providers.Local.config.script-epilogue = "sync"