From 12eb1b094da2b9bdf0d5690d29d59938fe9ac0e9 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 20 Sep 2024 14:16:01 -0400 Subject: [PATCH 1/2] Retry container monitor POST if it fails --- lib/galaxy/job_execution/container_monitor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/job_execution/container_monitor.py b/lib/galaxy/job_execution/container_monitor.py index dfed37daf8d0..0590ce715db9 100644 --- a/lib/galaxy/job_execution/container_monitor.py +++ b/lib/galaxy/job_execution/container_monitor.py @@ -75,7 +75,8 @@ def main(): if ports[key]["host"] == "0.0.0.0": ports[key]["host"] = host_ip if callback_url: - requests.post(callback_url, json={"container_runtime": ports}, timeout=DEFAULT_SOCKET_TIMEOUT) + r = requests.post(callback_url, json={"container_runtime": ports}, timeout=DEFAULT_SOCKET_TIMEOUT) + r.raise_for_status() else: with open("container_runtime.json", "w") as f: json.dump(ports, f) From b3eb78a9e802c5a61dc10cfb5ac1d9dfc4608646 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 23 Sep 2024 10:57:32 +0200 Subject: [PATCH 2/2] Fix wrong final state when init_from is used Fixes https://github.com/galaxyproject/galaxy/pull/18855#issuecomment-2366883313. I don't think this had any effect in the previous version since we'd always set the state to final_job_state anyway. --- lib/galaxy/model/store/discover.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py index db3ac40bf2e5..2e3ab8dd51b9 100644 --- a/lib/galaxy/model/store/discover.py +++ b/lib/galaxy/model/store/discover.py @@ -245,7 +245,6 @@ def finalize_storage( if init_from: self.permission_provider.copy_dataset_permissions(init_from, primary_data) - primary_data.state = init_from.state else: self.permission_provider.set_default_hda_permissions(primary_data)