Librarian: graceful shutdown with resumable search state
CI / compile (pull_request) Successful in 10s
CI / unit (pull_request) Successful in 28s
CI / integration (pull_request) Successful in 27s
build / build (push) Successful in 42s
CI / compile (push) Successful in 10s
CI / unit (push) Successful in 26s
CI / integration (push) Successful in 25s

A restart of the librarian used to throw away an in-flight search (and any
searches still queued). Now search state survives a restart:

* Resumable DB scan (search_bot): each producer records a tell()-cookie
  watermark per chunk file as it goes (safe because search_for_doi drains
  the work queue before returning), and can seek back to it. search_for_doi
  now takes stop_event + resume and returns (result_list, positions,
  interrupted).

* Persisted requests: /query writes the accepted request to a disk queue
  before enqueuing; replay_requests re-enqueues unfinished ones on startup.
  So even a search still waiting in the queue survives a restart.

* Checkpoints: when a graceful shutdown interrupts a scan, the librarian
  writes {dois, found-so-far, per-file offsets}. On restart answer_query
  loads it, skips the (already done) Crossref+refine, and continues the
  scan from the saved offsets with the found DOIs pre-marked - no line is
  read twice and none is missed. A finished or crashed search forgets its
  request+checkpoint (no poison-pill replay).

* Graceful shutdown: SIGTERM/SIGINT set a shutdown event; the running scan
  checkpoints and the worker stops. The main thread then exits within a
  BOUNDED window (CONJURER_LIBRARIAN_GRACEFUL_TIMEOUT, default 45s) so the
  pod can never become an un-killable zombie. Needs terminationGracePeriod
  >= that in the deploy (separate PR).

Tests: search_bot resume correctness (seek past scanned, don't miss/re-scan;
stop_event -> interrupted) and librarian state mechanics (request replay,
forget, checkpoint round-trip, poison-pill drop). Suite: 58 unit + 49
integration green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit was merged in pull request #17.
This commit is contained in:
2026-08-02 22:09:49 +02:00
parent c5643aa28f
commit ac16b77f56
5 changed files with 397 additions and 66 deletions
@@ -0,0 +1,90 @@
"""Integration: the librarian's persisted search state (requests + checkpoints).
These pin the durable-state mechanics that let a search survive a restart:
* accepted requests are replayed (re-enqueued) after a restart,
* a finished/abandoned search is forgotten (request + checkpoint dropped),
* a checkpoint round-trips through disk intact.
The RESUME correctness itself (seek past scanned, don't miss, don't re-scan)
lives in tests/unit/test_search_bot.py.
"""
import logging
import sys
import types
import pytest
if "habanero" not in sys.modules:
_habanero = types.ModuleType("habanero")
_habanero.Crossref = object
sys.modules["habanero"] = _habanero
import conjurer_librarian as lib # noqa: E402
from durable_queue import DiskQueue # noqa: E402
_LOG = logging.getLogger("test-resume-state")
_LOG.addHandler(logging.NullHandler())
class _DummyCrossref:
def __init__(self, **kwargs):
self.kwargs = kwargs
@pytest.fixture
def state(tmp_path, monkeypatch):
monkeypatch.setattr(lib, "_requests", DiskQueue(str(tmp_path / "req")))
monkeypatch.setattr(lib, "_checkpoints", DiskQueue(str(tmp_path / "cp")))
monkeypatch.setattr(lib, "Crossref", _DummyCrossref)
monkeypatch.setenv("CONJURER_CROSSREF_MAILTO", "test@example.com")
monkeypatch.setattr(lib, "NETRC_FILE", "/nonexistent/conjurer/.netrc")
while not lib.librarian_queue.empty():
lib.librarian_queue.get()
lib.librarian_list.clear()
with lib._active_lock:
lib.active_queries.clear()
return None
def test_accepted_request_is_replayed_after_restart(state):
lib._requests.put("u1", {"query": "kwas foliowy", "deep_search": False})
lib.replay_requests(_LOG)
item = lib.librarian_queue.get_nowait()
assert isinstance(item, lib.Librarian)
assert item.uuid == "u1"
assert item.query == "kwas foliowy"
assert lib.active_queries["u1"] == "queued" # known again to the watchdog
def test_forget_search_drops_request_and_checkpoint(state):
lib._requests.put("u2", {"query": "x", "deep_search": False})
lib._checkpoints.put("u2", {"dois": {}, "found": [], "positions": {}})
lib._forget_search("u2")
assert not lib._requests.contains("u2")
assert not lib._checkpoints.contains("u2")
def test_checkpoint_round_trips_through_disk(state):
checkpoint = {
"dois": {"10.1/x": {"DOI": "10.1/x", "title": ["T"], "type": "article"}},
"found": ["10.1/already"],
"positions": {"0_chunk.txt": 4096},
}
lib._checkpoints.put("u3", checkpoint)
assert lib._checkpoints.get("u3") == checkpoint
def test_unreadable_replayed_request_is_dropped_not_looped(state, monkeypatch):
# A request that can't be reconstructed (e.g. missing Crossref contact) must
# be dropped, not retried forever.
lib._requests.put("u4", {"query": "x", "deep_search": False})
monkeypatch.delenv("CONJURER_CROSSREF_MAILTO", raising=False)
lib.replay_requests(_LOG)
assert lib.librarian_queue.empty()
assert not lib._requests.contains("u4") # forgotten, not left to loop