Skip to content

fix: add session.remove() and engine.dispose() to all DB retry paths #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neoneye merged 1 commit into from
Apr 14, 2026
Merged

fix: add session.remove() and engine.dispose() to all DB retry paths #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions worker_plan_database/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,23 @@ def update_task_state_with_retry(task_id: str, new_state: PlanState, max_retries
return True
except Exception as e:
logger.error(f"Database error updating task state (attempt {attempt + 1}/{max_retries}): {e}", exc_info=True)
db.session.rollback()
try:
db.session.rollback()
except Exception:
pass
try:
db.session.remove()
except Exception:
pass
if attempt < max_retries - 1:
logger.info(f"Retrying in {retry_delay} seconds...")
time.sleep(retry_delay)
else:
logger.error("Max retries reached for task state update")
try:
db.engine.dispose()
except Exception:
pass
return False
return False

Expand All @@ -438,7 +449,14 @@ def _update_failure_diagnostics(
db.session.commit()
except Exception as exc:
logger.error("Failed to write failure diagnostics for task %s: %s", task_id, exc, exc_info=True)
db.session.rollback()
try:
db.session.rollback()
except Exception:
pass
try:
db.session.remove()
except Exception:
pass

def update_task_progress_with_retry(
task_id: str,
Expand Down Expand Up @@ -483,12 +501,23 @@ def update_task_progress_with_retry(
return True
except Exception as e:
logger.error(f"Database error updating task progress (attempt {attempt + 1}/{max_retries}): {e}", exc_info=True)
db.session.rollback()
try:
db.session.rollback()
except Exception:
pass
try:
db.session.remove()
except Exception:
pass
if attempt < max_retries - 1:
logger.info(f"Retrying in {retry_delay} seconds...")
logger.info(f"Retrying in {retry_delay} seconds...")
time.sleep(retry_delay)
else:
logger.error("Max retries reached for task progress update")
try:
db.engine.dispose()
except Exception:
pass
return False
return False

Expand Down