Merge pull request #17315 from mvdbeek/backport_23.2_pendingrollbacke…

…rror2 [23.2] Backport Rollback invalidated transaction: catch them earlier
galaxyproject · Jan 17, 2024 · b9ba44b · b9ba44b
2 parents b3d31bf + a4d0c33
commit b9ba44b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/galaxy/jobs/runners/__init__.py b/lib/galaxy/jobs/runners/__init__.py
@@ -33,7 +33,10 @@
     job_script,
     write_script,
 )
-from galaxy.model.base import transaction
+from galaxy.model.base import (
+    check_database_connection,
+    transaction,
+)
 from galaxy.tool_util.deps.dependencies import (
     JobInfo,
     ToolInfo,
@@ -829,6 +832,7 @@ def monitor(self):
                 pass
             # Iterate over the list of watched jobs and check state
             try:
+                check_database_connection(self.sa_session)
                 self.check_watched_items()
             except Exception:
                 log.exception("Unhandled exception checking active jobs")

diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py
@@ -274,7 +274,6 @@ def url_to_destination(self, url):
         return JobDestination(runner="pulsar", params=url_to_destination_params(url))
 
     def check_watched_item(self, job_state):
-        check_database_connection(self.app.model.session())
         if self.use_mq:
             # Might still need to check pod IPs.
             job_wrapper = job_state.job_wrapper