Python tool for aircraft Doppler audio geolocation using historical ADS-B flight data (Source-available)
Python acoustic-geolocationads-baircraft-trackingairplaneaudio-forensicsdoppler-effectdoppler-shiftgeolocationosintsignal-processing
Honor cancellation during job startup recovery
Cinna Davisf97e57717e8e
diff --git a/src/dopplergeist/jobs.py b/src/dopplergeist/jobs.pyindex 7ef9699..0b953e4 100644--- a/src/dopplergeist/jobs.py+++ b/src/dopplergeist/jobs.py@@ -114,9 +114,15 @@ class JobManager:self._closed = False# Preserve terminal outputs. An interrupted process is never silently replayed.for path in self.root.glob("*/result.json"):- old = read_json(path)- if old["status"] not in TERMINAL:- result(path.parent, "failed", reason_code="interrupted", message="Service stopped before completion; submit a new job to retry.", **_evidence(old))+ if read_json(path)["status"] in TERMINAL:+ continue+ with _control_lock(path.parent):+ old = read_json(path)+ if old["status"] not in TERMINAL:+ if (path.parent / "cancel").exists():+ result(path.parent, "cancelled", message="Cancelled by the user; partial artifacts are preserved.", **_evidence(old))+ else:+ result(path.parent, "failed", reason_code="interrupted", message="Service stopped before completion; submit a new job to retry.", **_evidence(old))def directory(self, job_id):try:diff --git a/tests/test_local_cancel.py b/tests/test_local_cancel.pyindex 164af7a..7a28cec 100644--- a/tests/test_local_cancel.py+++ b/tests/test_local_cancel.py@@ -6,6 +6,7 @@ import timeimport pytest+from dopplergeist import jobsfrom dopplergeist.jobs import JobManager, read_json, request_local_cancel, result@@ -56,12 +57,83 @@ def test_local_cancel_requires_live_manager_and_preserves_terminal_jobs(tmp_pathwith pytest.raises(ValueError, match="No active job manager"):request_local_cancel(tmp_path, job_id)assert not (directory / "cancel").exists()-previous = result(directory, "inconclusive", reason_code="no_events", message="No events.")assert request_local_cancel(tmp_path, job_id) == previousassert not (directory / "cancel").exists()+def test_startup_recovery_honors_existing_cancellation(tmp_path):+ job_id, directory = make_running_job(tmp_path)+ (directory / "cancel").touch()+ manager = JobManager(tmp_path)+ try:+ assert manager.get(job_id)["status"] == "cancelled"+ finally:+ manager.close()+++def test_startup_recovery_keeps_interrupted_and_terminal_behavior(tmp_path):+ job_id, directory = make_running_job(tmp_path)+ finished_id, finished_directory = make_running_job(tmp_path)+ previous = result(finished_directory, "inconclusive", reason_code="no_events", message="No events.")+ manager = JobManager(tmp_path)+ try:+ interrupted = manager.get(job_id)+ assert interrupted["status"] == "failed" and interrupted["reason_code"] == "interrupted"+ assert manager.get(finished_id) == previous+ assert not (finished_directory / ".control.lock").exists()+ finally:+ manager.close()+++def test_cancel_request_during_startup_recovery_is_consistent(tmp_path, monkeypatch):+ job_id, directory = make_running_job(tmp_path)+ recovery_read = threading.Event()+ allow_recovery = threading.Event()+ original_read = jobs.read_json+ managers, responses, errors = [], [], []++ def pause_recovery(path):+ value = original_read(path)+ if threading.current_thread().name == "recovery-test" and path == directory / "result.json":+ recovery_read.set()+ assert allow_recovery.wait(8)+ return value++ monkeypatch.setattr(jobs, "read_json", pause_recovery)++ def recover():+ try:+ managers.append(JobManager(tmp_path))+ except Exception as error:+ errors.append(error)++ recovery = threading.Thread(target=recover, name="recovery-test")+ recovery.start()+ cancel = None+ try:+ assert recovery_read.wait(5)+ cancel = threading.Thread(target=lambda: responses.append(request_local_cancel(tmp_path, job_id)))+ cancel.start()+ cancel.join(timeout=0.5)+ allow_recovery.set()+ recovery.join(timeout=8)+ cancel.join(timeout=8)+ assert not recovery.is_alive() and not cancel.is_alive() and not errors+ final = original_read(directory / "result.json")+ if responses[0].get("cancellation_requested"):+ assert final["status"] == "cancelled"+ else:+ assert responses[0] == final+ assert final["status"] == "failed" and final["reason_code"] == "interrupted"+ finally:+ allow_recovery.set()+ recovery.join(timeout=8)+ if cancel is not None:+ cancel.join(timeout=8)+ for manager in managers:+ manager.close()+def test_local_cancel_stops_unresponsive_worker_and_preserves_checkpoint(tmp_path, monkeypatch):# Exercise the control plane with a real process that never reports progress;# no recording or aircraft observations are generated.