From fd36cd36a0a1d048e8ff505e78a02b18beebb4ab Mon Sep 17 00:00:00 2001
From: Keith Suderman <suderman@jhu.edu>
Date: Wed, 29 May 2024 15:08:27 -0400
Subject: [PATCH 1/2] Bump build number

---
 abm/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abm/VERSION b/abm/VERSION
index d501693..ea61abf 100644
--- a/abm/VERSION
+++ b/abm/VERSION
@@ -1 +1 @@
-2.9.0-dev.8
\ No newline at end of file
+2.9.0-dev.9
\ No newline at end of file

From 774f956d6d063ef3fadc2e98fbcbca580c2f0afa Mon Sep 17 00:00:00 2001
From: Keith Suderman <suderman@jhu.edu>
Date: Thu, 6 Jun 2024 14:37:21 -0400
Subject: [PATCH 2/2] Use gi.jobs.get_metrics(job_id) to get the metrics for a
 job before writing the metrics file.

---
 abm/lib/benchmark.py  | 1 +
 abm/lib/common.py     | 3 ++-
 abm/lib/experiment.py | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/abm/lib/benchmark.py b/abm/lib/benchmark.py
index b9962a2..f9c5655 100644
--- 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
index f75fe3a..a6d113d 100644
--- 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
index 54a1707..ae0addc 100644
--- 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']