opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15496 from jdavcs/dev_itemgrabber_conn

Browse Source 
Use connection instead of session for ItemGrabber
This commit is contained in:
Marius van den Beek
2023-02-05 10:57:07 +01:00
committed by GitHub
parent 9d4bad7b33 fbc4ddf0f1
commit af8e2a3257
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/handler.py
+19 -20
View File
@@ -173,26 +173,25 @@ class ItemGrabber:
# https://blog.2ndquadrant.com/what-is-select-skip-locked-for-in-postgresql-9-5/
if self._grab_query is None:
self.setup_query()
self.sa_session.expunge_all()
conn = self.sa_session.connection(execution_options=self._grab_conn_opts)
with conn.begin() as trans:
try:
proxy = conn.execute(self._grab_query)
if self._supports_returning:
rows = proxy.fetchall()
if rows:
log.debug(f"Grabbed {self.grab_type}(s): {', '.join(str(row[0]) for row in rows)}")
trans.commit()
else:
trans.rollback()
else:
trans.commit()
except OperationalError as e:
# If this is a serialization failure on PostgreSQL, then e.orig is a psycopg2 TransactionRollbackError
# and should have attribute `code`. Other engines should just report the message and move on.
if int(getattr(e.orig, "pgcode", -1)) != 40001:
log.debug("Grabbing %s failed (serialization failures are ok): %s", self.grab_type, unicodify(e))
trans.rollback()
with self.app.model.engine.connect() as conn:
with conn.begin() as trans:
try:
proxy = conn.execute(self._grab_query)
if self._supports_returning:
rows = proxy.fetchall()
if rows:
log.debug(f"Grabbed {self.grab_type}(s): {', '.join(str(row[0]) for row in rows)}")
else:
trans.rollback()
except OperationalError as e:
# If this is a serialization failure on PostgreSQL, then e.orig is a psycopg2 TransactionRollbackError
# and should have attribute `code`. Other engines should just report the message and move on.
if int(getattr(e.orig, "pgcode", -1)) != 40001:
log.debug(
"Grabbing %s failed (serialization failures are ok): %s", self.grab_type, unicodify(e)
)
trans.rollback()
class JobHandlerQueue(Monitors):