Merge pull request #299 from galaxyproject/298-replace-show-job

298 replace show job
galaxyproject · Jun 6, 2024 · 52424a9 · 52424a9
2 parents 9dca47c + 774f956
commit 52424a9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/abm/VERSION b/abm/VERSION
@@ -1 +1 @@
-2.9.0-dev.8
+2.9.0-dev.9
diff --git a/abm/lib/benchmark.py b/abm/lib/benchmark.py
@@ -456,6 +456,7 @@ def wait_for_jobs(context, gi: GalaxyInstance, invocations: dict):
     jobs = gi.jobs.get_jobs(history_id=hid)
     for job in jobs:
         data = gi.jobs.show_job(job['id'], full_details=True)
+        data['job_metrics'] = gi.jobs.get_job_metrics(job['id'])
         metrics = {
             'run': run,
             'cloud': cloud,

diff --git a/abm/lib/common.py b/abm/lib/common.py
@@ -287,7 +287,8 @@ def find_executable(name):
     "galaxy_slots",
     # "memory.failcnt",
     "memory.limit_in_bytes",
-    "memory.max_usage_in_bytes",
+    "memory.peak",
+    #"memory.max_usage_in_bytes",
     # "memory.memsw.limit_in_bytes",
     # "memory.memsw.max_usage_in_bytes",
     # "memory.oom_control.oom_kill_disable",

diff --git a/abm/lib/experiment.py b/abm/lib/experiment.py
@@ -233,7 +233,8 @@ def summarize(context: Context, args: list):
     'runtime_seconds',
     'cpuacct.usage',
     'memory.limit_in_bytes',
-    'memory.max_usage_in_bytes',
+    'memory.peak'
+    #'memory.max_usage_in_bytes',
 ]  # ,'memory.soft_limit_in_bytes']