fix(lock): fix prune lock in db

Author: kshitijrajsharma

osmsg/_tick.py

@@ -107,6 +107,9 @@ def _rebuild_store_from_pg(db_path: Path, dsn: str) -> None:
         conn.close()
 
 
+_TICK_TIMEOUT_SECONDS = int(os.environ.get("OSMSG_TICK_TIMEOUT_SECONDS", "1200"))
+
+
 def main() -> int:
     extra_args = shlex.split(os.environ.get("OSMSG_EXTRA_ARGS", ""))
     bootstrap_days = os.environ.get("OSMSG_BOOTSTRAP_DAYS", "1")
@@ -154,7 +157,11 @@ def main() -> int:
             cmd.extend(["--days", bootstrap_days])
 
         print(f"[osmsg-tick] {' '.join(cmd)}", flush=True)
-        rc = subprocess.call(cmd)
+        try:
+            rc = subprocess.call(cmd, timeout=_TICK_TIMEOUT_SECONDS)
+        except subprocess.TimeoutExpired:
+            print(f"[osmsg-tick] killed: exceeded {_TICK_TIMEOUT_SECONDS}s", flush=True)
+            rc = 1
         # With a psql push, Postgres is the permanent copy and the store is a per-tick delta buffer: clear
         # its data (keeping resume `state`) after a successful push so the next push stays small and fast.
         if rc == 0 and psql_dsn:

osmsg/export/psql.py

@@ -177,6 +177,7 @@ def to_psql(conn: duckdb.DuckDBPyConnection, dsn: str, *, bulk_load: bool = Fals
     conn.execute("INSTALL spatial")
     conn.execute("LOAD spatial")
     attach_postgres(conn, dsn, alias="pg_target")
+    pg_execute(conn, "SET lock_timeout = '120s'", alias="pg_target")
     try:
         # Create the tags composite type as the first PG op (a fresh write txn; a prior read would pin the
         # connection read-only). On re-push it already exists (the idempotent case); anything else is real.

osmsg/prune.py

@@ -29,6 +29,8 @@ def prune_pg(dsn: str, cutoff: dt.datetime) -> tuple[int, int]:
 
     if cs_n:
         writer = connect_postgres(dsn)
+        pg_execute(writer, "SET lock_timeout = '120s'")
+        pg_execute(writer, "SET statement_timeout = '1800s'")
         pg_execute(
             writer,
             f"DELETE FROM changeset_stats s USING changesets c WHERE s.changeset_id = c.changeset_id AND c.{older}",

tests/test_tick.py

@@ -88,6 +88,15 @@ def test_cold_start_bootstraps_at_day(tmp_path, monkeypatch, captured_cmd, clean
     assert cmd[-2:] == ["--days", "1"]  # default cold-start window
 
 
+def test_tick_watchdog_returns_nonzero_when_run_times_out(tmp_path, monkeypatch, clean_env):
+    def slow_call(cmd, *args, **kwargs):
+        raise _tick.subprocess.TimeoutExpired(cmd, kwargs.get("timeout", 0))
+
+    monkeypatch.setattr(_tick.subprocess, "call", slow_call)
+    monkeypatch.setenv("OSMSG_EXTRA_ARGS", f"--name stats --output-dir {tmp_path}")
+    assert _tick.main() == 1
+
+
 def test_planet_continues_seeded_source(tmp_path, monkeypatch, captured_cmd, clean_env):
     """A `--insert --seed-only` seeds the store's resume source; the planet tick must --update off that
     seed, not re-bootstrap."""