~95% on SimpleQA (e.g. Qwen3.6-27B on a 3090). Supports all local and cloud LLMs (llama.cpp, Ollama, Google, ...). 10+ search engines - arXiv, PubMed, your private documents. Everything Local & Encrypted.
Python academiaanthropicarxivbravedeep-researchencryptionhome-automationhomeserverlocallocal-deep-researchlocal-llmmistralollamaopenaipubmedresearchresearch-toolretrieval-augmented-generationsearxngself-hosted
fix(queue): roll back session on commit failure in QueueManager (#4977)
LearningCircuit17296efe603e
diff --git a/changelog.d/+queue-manager-commit-rollback.bugfix.md b/changelog.d/+queue-manager-commit-rollback.bugfix.mdnew file mode 100644index 0000000000..e74c652ffd--- /dev/null+++ b/changelog.d/+queue-manager-commit-rollback.bugfix.md@@ -0,0 +1 @@+Queueing or cancelling research no longer risks a corrupted database session: if a commit fails inside `QueueManager.add_to_queue` / `remove_from_queue`, the transaction is now rolled back before the error propagates, so a subsequent operation on that session doesn't fail with a masking error. Completes the rollback coverage of #2055 for the queue manager (the `queue_service` and `processor_v2` halves landed earlier in #2414, #3481, #3506, #3521).diff --git a/src/local_deep_research/web/queue/manager.py b/src/local_deep_research/web/queue/manager.pyindex f57a2eef40..67fbdea428 100644--- a/src/local_deep_research/web/queue/manager.py+++ b/src/local_deep_research/web/queue/manager.py@@ -2,12 +2,38 @@from loguru import loggerfrom sqlalchemy import func+from sqlalchemy.orm import Sessionfrom ...database.session_context import get_user_db_sessionfrom ...database.models import QueuedResearch, ResearchHistoryfrom .processor_v2 import queue_processor+def _safe_commit(session: Session) -> None:+ """Commit the transaction, rolling back on failure.++ Mirrors ``UserQueueService._safe_commit``. The ``get_user_db_session``+ context manager only closes the session; it does not roll back a failed+ commit, which would leave the session in a dirty state and mask the+ original error on any subsequent operation. See issue #2055.++ The rollback itself is guarded so that a rollback failure is logged at+ debug level rather than masking the original commit error — the same+ defensive shape as ``QueueProcessorV2._commit_with_safe_rollback``.+ """+ try:+ session.commit()+ except Exception:+ logger.exception("Database commit failed, attempting rollback")+ try:+ session.rollback()+ except Exception:+ logger.debug(+ "Rollback after commit failure also failed", exc_info=True+ )+ raise++class QueueManager:"""Manages the research queue operations"""@@ -44,7 +70,7 @@ class QueueManager:position=max_position + 1,)session.add(queued_record)- session.commit()+ _safe_commit(session)logger.info(f"Added research {research_id} to queue at position {max_position + 1}"@@ -143,7 +169,7 @@ class QueueManager:QueuedResearch.position > position,).update({QueuedResearch.position: QueuedResearch.position - 1})- session.commit()+ _safe_commit(session)logger.info(f"Removed research {research_id} from queue")return Truediff --git a/tests/web/queue/test_queue_manager.py b/tests/web/queue/test_queue_manager.pyindex c4e4c84db5..cd0a467c08 100644--- a/tests/web/queue/test_queue_manager.py+++ b/tests/web/queue/test_queue_manager.py@@ -344,3 +344,105 @@ class TestQueueManagerGetUserQueue:with pytest.raises(DatabaseSessionError):QueueManager.get_user_queue(username="testuser")+++class TestQueueManagerTransactionRollback:+ """Tests that commit failures roll back the session rather than leaving it dirty.++ Regression coverage for the manager.py half of issue #2055. The+ ``get_user_db_session`` context manager only closes the session, so a+ failed commit must be rolled back explicitly; otherwise the dirty session+ state masks the original error on the next operation.+ """++ def test_add_to_queue_rolls_back_on_commit_failure(self):+ """add_to_queue rolls back and re-raises when commit fails."""+ mock_session = MagicMock()+ mock_session.commit.side_effect = RuntimeError("commit failed")++ # Mock query chain for max position+ mock_query = MagicMock()+ mock_query.filter_by.return_value.scalar.return_value = 0+ mock_session.query.return_value = mock_query++ with patch(+ "local_deep_research.web.queue.manager.get_user_db_session",+ _mock_user_db_session(mock_session),+ ):+ from local_deep_research.web.queue.manager import QueueManager++ with pytest.raises(RuntimeError, match="commit failed"):+ QueueManager.add_to_queue(+ username="testuser",+ research_id="test-id-123",+ query="test query",+ mode="detailed",+ settings={},+ )++ # Session must be rolled back to clear dirty state, and the record+ # must not have been left behind as if the commit succeeded.+ mock_session.commit.assert_called_once()+ mock_session.rollback.assert_called_once()++ def test_remove_from_queue_rolls_back_on_commit_failure(self):+ """remove_from_queue rolls back and re-raises when commit fails."""+ mock_session = MagicMock()+ mock_session.commit.side_effect = RuntimeError("commit failed")++ # Mock queued research item+ mock_queued = MagicMock()+ mock_queued.position = 2++ mock_query = MagicMock()+ mock_query.filter_by.return_value.first.return_value = mock_queued+ mock_query.filter.return_value.update.return_value = None+ mock_session.query.return_value = mock_query++ with patch(+ "local_deep_research.web.queue.manager.get_user_db_session",+ _mock_user_db_session(mock_session),+ ):+ from local_deep_research.web.queue.manager import QueueManager++ with pytest.raises(RuntimeError, match="commit failed"):+ QueueManager.remove_from_queue(+ username="testuser", research_id="test-id-123"+ )++ mock_session.commit.assert_called_once()+ mock_session.rollback.assert_called_once()++ def test_rollback_failure_does_not_mask_commit_error(self):+ """If rollback itself raises, the original commit error still propagates.++ Guards against the rollback call masking the original failure; this is+ the defensive shape shared with+ ``QueueProcessorV2._commit_with_safe_rollback``.+ """+ mock_session = MagicMock()+ mock_session.commit.side_effect = RuntimeError("commit failed")+ mock_session.rollback.side_effect = OSError("rollback failed")++ mock_query = MagicMock()+ mock_query.filter_by.return_value.scalar.return_value = 0+ mock_session.query.return_value = mock_query++ with patch(+ "local_deep_research.web.queue.manager.get_user_db_session",+ _mock_user_db_session(mock_session),+ ):+ from local_deep_research.web.queue.manager import QueueManager++ # The ORIGINAL commit error must surface, not the rollback error.+ with pytest.raises(RuntimeError, match="commit failed"):+ QueueManager.add_to_queue(+ username="testuser",+ research_id="test-id-123",+ query="test query",+ mode="detailed",+ settings={},+ )++ mock_session.commit.assert_called_once()+ mock_session.rollback.assert_called_once()