[arvados] updated: 2.6.0-584-gf165ffe5ba

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
 sdk/cwl/arvados_cwl/arvworkflow.py  | 3 ++-
 sdk/cwl/arvados_cwl/runner.py       | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

       via  f165ffe5ba28815b965fa4f92ceed99fc53e0776 (commit)
      from  cab6238cf14dedb0d34bdb477dbb1bc5717e9c4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f165ffe5ba28815b965fa4f92ceed99fc53e0776
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Sep 11 21:49:55 2023 -0400

    20825: Make SeparateRunner reusable
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 76a882a083..b2c9706ed6 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -593,7 +593,7 @@ class RunnerContainer(Runner):
                 "ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
                 "API": True
             },
-            "use_existing": False, # Never reuse the runner container - see #15497.
+            "use_existing": self.reuse_runner,
             "properties": {}
         }
 
diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index 5dacdeb48b..bce1a53978 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -799,7 +799,8 @@ class ArvadosWorkflow(Workflow):
                                secret_store=self.arvrunner.secret_store,
                                collection_cache_size=runtimeContext.collection_cache_size,
                                collection_cache_is_default=self.arvrunner.should_estimate_cache_size,
-                               git_info=runtimeContext.git_info).job(joborder, output_callback, runtimeContext)
+                               git_info=runtimeContext.git_info,
+                               reuse_runner=True).job(joborder, output_callback, runtimeContext)
 
 
     def job(self, joborder, output_callback, runtimeContext):
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 860f8a1b9a..71bc895432 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -828,7 +828,8 @@ class Runner(Process):
                  priority=None, secret_store=None,
                  collection_cache_size=256,
                  collection_cache_is_default=True,
-                 git_info=None):
+                 git_info=None,
+                 reuse_runner=False):
 
         self.loadingContext = loadingContext.copy()
 
@@ -861,6 +862,7 @@ class Runner(Process):
         self.enable_dev = self.loadingContext.enable_dev
         self.git_info = git_info
         self.fast_parser = self.loadingContext.fast_parser
+        self.reuse_runner = reuse_runner
 
         self.submit_runner_cores = 1
         self.submit_runner_ram = 1024  # defaut 1 GiB

-----------------------------------------------------------------------


hooks/post-receive
--