adds SCATTER MULTIPLIER

EOEPCA · Nov 18, 2023 · dd4b13a · dd4b13a
1 parent 3164142
commit dd4b13a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -7,6 +7,10 @@
 * `STORAGE_CLASS`: defines the k8s RWX storage class for Calrissian. Defaults to `longhorn`
 * `KEEP_SESSION`: if set to `true`, the session and thus the kubernetes namespace is not deleted
 
+### Calrissian resources
+
+* `SCATTER_MULTIPLIER`: scatter factor multiplier. Defaults to `2`.
+
 ### CWL Wrapper
 
 The cwl-wrapper templates can be customized with the environment variables:

diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,3 @@
 [metadata]
 name = zoo_calrissian_runner
-version = 0.1.10
+version = 0.1.11
diff --git a/zoo_calrissian_runner/__init__.py b/zoo_calrissian_runner/__init__.py
@@ -168,7 +168,7 @@ def eval_resource(self):
                     if resource_requirement := self.get_resource_requirement(
                         self.get_object_by_id(step.run[1:])
                     ):
-                        multiplier = 2 if step.scatter else 1
+                        multiplier = int(os.getenv("SCATTER_MULTIPLIER", 2)) if step.scatter else 1
                         for resource_type in [
                             "coresMin",
                             "coresMax",
@@ -341,7 +341,7 @@ def assert_parameters(self):
         )
 
     def execute(self):
-        self.update_status(progress=97, message="Pre-execution hook")
+        self.update_status(progress=2, message="Pre-execution hook")
         self.handler.pre_execution_hook()
 
         if not (self.assert_parameters()):