Merge branch 'release_24.1' into dev

bgruening · Sep 23, 2024 · bd79636 · bd79636
2 parents e496652 + 1a02832
commit bd79636
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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)

diff --git 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)