Merge pull request #212 from HSF/flin

add CRIC job_minramcount to respect job memory requirement
HSF · Feb 13, 2024 · d3a0a4a · d3a0a4a
2 parents d88a459 + 706cc84
commit d3a0a4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pandaharvester/commit_timestamp.py b/pandaharvester/commit_timestamp.py
@@ -1 +1 @@
-timestamp = "13-02-2024 10:21:25 on cleanup (by mightqxc)"
+timestamp = "13-02-2024 10:41:21 on flin (by mightqxc)"
diff --git a/pandaharvester/harvesterworkermaker/simple_worker_maker.py b/pandaharvester/harvesterworkermaker/simple_worker_maker.py
@@ -153,9 +153,9 @@ def make_worker(self, jobspec_list, queue_config, job_type, resource_type):
                 except Exception:
                     pass
             # fill in worker attributes
-            if (nCore > 0 and "nCore" in self.jobAttributesToUse) or is_ucore:
+            if is_ucore or (nCore > 0 and "nCore" in self.jobAttributesToUse):
                 workSpec.nCore = nCore
-            if (minRamCount > 0 and "minRamCount" in self.jobAttributesToUse) or is_ucore:
+            if is_ucore or (minRamCount > 0 and ("minRamCount" in self.jobAttributesToUse or associated_params_dict.get("job_minramcount") is True)):
                 workSpec.minRamCount = minRamCount
             if maxDiskCount > 0 and ("maxDiskCount" in self.jobAttributesToUse or associated_params_dict.get("job_maxdiskcount") is True):
                 workSpec.maxDiskCount = maxDiskCount