[ARVADOS] created: 1.3.0-1777-g36994ebb9

Git user git at public.curoverse.com
Thu Oct 24 15:11:07 UTC 2019


        at  36994ebb9f4b0c3149b671e0229677c39a37cba8 (commit)


commit 36994ebb9f4b0c3149b671e0229677c39a37cba8
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Oct 24 12:09:28 2019 -0300

    15497: Don't reuse runner containers.
    
    When using a-c-r with --submit, never reuse the runner container so that
    a potential reuse=false hint on a workflow step can be honored.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index aa3388d00..df4f95a82 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -425,7 +425,7 @@ class RunnerContainer(Runner):
                 "ram": 1024*1024 * (math.ceil(self.submit_runner_ram) + math.ceil(self.collection_cache_size)),
                 "API": True
             },
-            "use_existing": self.enable_reuse,
+            "use_existing": False, # Never reuse the runner container
             "properties": {}
         }
 

commit 6980748d61d4dff0ab95be4c65f55be47d13bb57
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Oct 24 12:07:59 2019 -0300

    15497: Fixes tests to confirm that runner containers don't get reused.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index ccbce3ed3..3dd04040a 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -36,7 +36,7 @@ from .perf import Perf
 from ._version import __version__
 from .executor import ArvCwlExecutor
 
-# These arn't used directly in this file but
+# These aren't used directly in this file but
 # other code expects to import them from here
 from .arvcontainer import ArvadosContainer
 from .arvtool import ArvadosCommandTool
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index d6ef665fb..927e43ad7 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -314,7 +314,7 @@ def stubs(func):
                 'vcpus': 1,
                 'ram': (1024+256)*1024*1024
             },
-            'use_existing': True,
+            'use_existing': False,
             'properties': {},
             'secret_mounts': {}
         }
@@ -690,7 +690,7 @@ class TestSubmit(unittest.TestCase):
                 'vcpus': 1,
                 'ram': 1342177280
             },
-            'use_existing': True,
+            'use_existing': False,
             'properties': {},
             'secret_mounts': {}
         }
@@ -785,7 +785,7 @@ class TestSubmit(unittest.TestCase):
                 'vcpus': 1,
                 'ram': 1342177280
             },
-            'use_existing': True,
+            'use_existing': False,
             'properties': {
                 "template_uuid": "962eh-7fd4e-gkbzl62qqtfig37"
             },
@@ -1180,7 +1180,7 @@ class TestSubmit(unittest.TestCase):
                 }
             },
             "state": "Committed",
-            "use_existing": True
+            "use_existing": False
         }
 
         stubs.api.container_requests().create.assert_called_with(

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list