Librarian: drop write-only result dumps + tame search logging
CI / compile (pull_request) Successful in 9s
CI / unit (pull_request) Successful in 23s
CI / integration (pull_request) Successful in 27s
build / build (push) Successful in 33s
CI / compile (push) Successful in 13s
CI / unit (push) Successful in 33s
CI / integration (push) Successful in 27s
CI / compile (pull_request) Successful in 9s
CI / unit (pull_request) Successful in 23s
CI / integration (pull_request) Successful in 27s
build / build (push) Successful in 33s
CI / compile (push) Successful in 13s
CI / unit (push) Successful in 33s
CI / integration (push) Successful in 27s
Two hygiene fixes on top of the work-queue OOM bound: Result dumps: cr_results / rr_results / s_results.json were write-only (nothing reads them) yet accumulated EVERY search forever and json.load'd the whole growing file on each write - unbounded RAM and PVC growth, and for a deep search the raw cr_results dump is hundreds of MB. They are now off by default (CONJURER_LIBRARIAN_DEBUG_DUMPS) and, when enabled, are overwritten with just the latest search - never loaded or accumulated. not_in_db.json is untouched: it's a real queue the scraper drains. Search logging: search_bot logged via print(), including a per-line carriage-return progress line that flooded stdout / the log file with millions of entries - fine for a desktop app, unreadable and bloating in a container. All of it is now proper logging at DEBUG (with coarse per-500k-line progress), so a normal run is quiet. The librarian log level is configurable (CONJURER_LIBRARIAN_LOG_LEVEL, default INFO) and a stdout handler is added so stays useful now that the search no longer prints straight to stdout. Set DEBUG for full verbosity. Also: make test_result_delivery_contract hermetic (point the durable spool at a temp dir so it can't pollute or be poisoned by the real result_inbox/ between runs) and gitignore the runtime spool dirs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit was merged in pull request #16.
This commit is contained in:
@@ -102,15 +102,18 @@ def producer(out_q, control_q, filename, _logger):
|
||||
# producer partway and leaving every DOI after the bad byte unsearched.
|
||||
# DOIs are ASCII, so a replaced byte can only affect junk, never a match.
|
||||
with open(DATABASE_PATH + filename, "r", encoding=ENCODING, errors="replace") as operated_file:
|
||||
print(f"Worker {filename} ")
|
||||
_logger.debug("Producer started: %s", filename)
|
||||
line_no = 0
|
||||
while True:
|
||||
line = operated_file.readline()
|
||||
line_no += 1
|
||||
print(f"\t \t \t \t \t \t W{filename}{line_no}\r", end="")
|
||||
# Coarse progress at DEBUG only - the old per-line carriage-return
|
||||
# print flooded stdout / the log file with millions of lines.
|
||||
if line_no % 500000 == 0:
|
||||
_logger.debug("Producer %s: %d lines read", filename, line_no)
|
||||
|
||||
if not line:
|
||||
print(f"EOF {filename}")
|
||||
_logger.debug("Producer %s: EOF at %d lines", filename, line_no)
|
||||
break
|
||||
|
||||
# Backpressure-safe put onto the BOUNDED queue: wait for room,
|
||||
@@ -130,7 +133,7 @@ def producer(out_q, control_q, filename, _logger):
|
||||
except Empty:
|
||||
pass
|
||||
if stopped:
|
||||
print("TERM signal received (queue full)")
|
||||
_logger.debug("Producer %s: TERM (queue full)", filename)
|
||||
break
|
||||
|
||||
try:
|
||||
@@ -139,10 +142,10 @@ def producer(out_q, control_q, filename, _logger):
|
||||
check = False
|
||||
|
||||
if check is _sentinel:
|
||||
print("TERM signal received")
|
||||
_logger.debug("Producer %s: TERM signal", filename)
|
||||
control_q.put(check)
|
||||
break
|
||||
print(f"Worker finished: {filename}")
|
||||
_logger.debug("Producer finished: %s", filename)
|
||||
except Exception as exc: # pylint: disable=broad-except
|
||||
# No per-file error (missing/unreadable chunk, a decode edge case that
|
||||
# slips past errors="replace", anything unforeseen) may take the whole
|
||||
@@ -150,7 +153,6 @@ def producer(out_q, control_q, filename, _logger):
|
||||
# the sentinel below still fires (finally), so the consumers' count stays
|
||||
# correct and nothing deadlocks or silently loses a producer.
|
||||
_logger.warning("Chunk %s failed, skipping rest of it: %s", filename, exc)
|
||||
print(f"Worker {filename} failed: {exc}")
|
||||
finally:
|
||||
# ALWAYS emit exactly one sentinel per producer, on every exit path (EOF,
|
||||
# early TERM, or crash). This is what lets the consumers count producers
|
||||
@@ -170,7 +172,7 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, expe
|
||||
live_results (list): List to store the search results.
|
||||
_logger: Logger object for logging.
|
||||
"""
|
||||
print(f"Consumer thread started: {no} no")
|
||||
_logger.debug("Consumer %s started", no)
|
||||
empty_counter = 0
|
||||
alive_no = 0
|
||||
# DOI -> result item, so a line is matched with one O(1) dict lookup instead
|
||||
@@ -182,12 +184,14 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, expe
|
||||
data = in_q.get(block=True, timeout = 1)
|
||||
if data is _sentinel:
|
||||
control_dict["sentinels"] += 1
|
||||
print(f"Workers finished: {control_dict['sentinels']} reported by consumer {no}")
|
||||
_logger.debug(
|
||||
"Consumer %s: producer done (%d/%d)",
|
||||
no, control_dict["sentinels"], expected_sentinels,
|
||||
)
|
||||
|
||||
else:
|
||||
empty_counter = 0
|
||||
alive_no += 1
|
||||
print(f"C{no}__{alive_no}\r", end="")
|
||||
|
||||
# Each DB line is a DOI (optionally followed by metadata). Match
|
||||
# the WHOLE first token exactly - the old `item["DOI"] in data`
|
||||
@@ -197,8 +201,8 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, expe
|
||||
line_doi = parts[0] if parts else ""
|
||||
item = doi_index.get(line_doi)
|
||||
if item is not None and not item["exists"]:
|
||||
print(f"HIT in {no}: {line_doi}")
|
||||
_logger.info("HIT %s", line_doi)
|
||||
# HIT can fire thousands of times for a deep search -> DEBUG.
|
||||
_logger.debug("HIT %s (consumer %s)", line_doi, no)
|
||||
item["exists"] = True
|
||||
live_results.append(item)
|
||||
# All found? Signal producers to stop early (rare -> cheap).
|
||||
@@ -207,20 +211,18 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, expe
|
||||
except Empty:
|
||||
empty_counter += 1
|
||||
time.sleep(1)
|
||||
print(f"Consumer {no} empty")
|
||||
# Order matters: the >EMPTY_LIMIT break must be checked BEFORE the
|
||||
# lesser threshold, otherwise (as in the original) the first branch
|
||||
# always wins and the break is dead code, leaving the sentinel count
|
||||
# as the only exit - which is exactly what used to hang the search.
|
||||
if empty_counter > EMPTY_LIMIT:
|
||||
print(f"Consumer thread finished {no} (idle backstop)")
|
||||
_logger.debug("Consumer %s finished (idle backstop)", no)
|
||||
break
|
||||
if empty_counter > 5:
|
||||
print(f"Consumer {no} empty lvl 2")
|
||||
time.sleep(2)
|
||||
|
||||
if control_dict["sentinels"] >= expected_sentinels:
|
||||
_logger.info(f"All workers finished {no}")
|
||||
_logger.debug("Consumer %s: all producers finished", no)
|
||||
break
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user