Fail task when heartbeat returns server error.

vdbergh · vdbergh · commit 0710ab42d437 · 2025-12-18T21:33:43.000+01:00
Currently the task is stopped normally. This PR should be merged after #2415 since it will expose IP addresses.
diff --git a/worker/games.py b/worker/games.py
@@ -1089,7 +1089,12 @@ def shorten_hash(match):
         if current_state["task_id"] is None:
             # This task is no longer necessary.
             # Error message has already been printed.
-            return False
+            error = current_state["last_error"]
+            if error is not None:
+                current_state["last_error"] = None
+                raise WorkerException(error)
+            else:
+                return False
         try:
             line = q.get_nowait().strip()
         except Empty:
diff --git a/worker/sri.txt b/worker/sri.txt
@@ -1 +1 @@
-{"__version": 305, "updater.py": "eDDBPKA/vrTCadgtEJFdL06vSoiysF0JhiHKdEnjQv3zS4kfdOAqnco/DJpDWbvh", "worker.py": "Y0kkVAk+3q3+HuWmVqgcPx7/h+CoLyPihLUszUGrvphfzNn55qXwqC+xh0fPz/Zt", "games.py": "uUpIoWu/jB6IoWN4aqSmRvtb7chhVswcFqIiT+G/cKNUWTam8ARxMZARNmTqGQ9p"}
+{"__version": 305, "updater.py": "eDDBPKA/vrTCadgtEJFdL06vSoiysF0JhiHKdEnjQv3zS4kfdOAqnco/DJpDWbvh", "worker.py": "ZFcoVOBV7YvMhCunXgX5Cix1Vn6RV/81534N4BSH0e8Eplsln4dNqlcNJb+VnAhK", "games.py": "skc/jkBaVQxQglPbndKYH1gbZo8VOdb1z72oEAxSDPpCAm65F3Ua3RzbqrjkWeXa"}
diff --git a/worker/worker.py b/worker/worker.py
@@ -1205,6 +1205,7 @@ def heartbeat(worker_info, password, remote, current_state):
                     # Error message has already been printed.
                     current_state["task_id"] = None
                     current_state["run"] = None
+                    current_state["last_error"] = req["error"]
     else:
         print("Heartbeat stopped.")
 
@@ -1309,6 +1310,7 @@ def fetch_and_handle_task(
     run, task_id = req["run"], req["task_id"]
     current_state["run"] = run
     current_state["task_id"] = task_id
+    current_state["last_error"] = None
 
     print(f"Working on task {task_id} from {remote}/tests/view/{run['_id']}.")
     if "sprt" in run["args"]:
@@ -1368,6 +1370,7 @@ def fetch_and_handle_task(
 
     current_state["task_id"] = None
     current_state["run"] = None
+    current_state["last_error"] = None
 
     payload = {
         "password": password,
@@ -1462,6 +1465,7 @@ def worker():
     current_state = {
         "run": None,  # the current run
         "task_id": None,  # the id of the current task
+        "last_error": None,  # set in the hearbeat loop
         "alive": True,  # controls the main and heartbeat loop
         "last_updated": datetime.now(
             timezone.utc

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"__version": 305, "updater.py": "eDDBPKA/vrTCadgtEJFdL06vSoiysF0JhiHKdEnjQv3zS4kfdOAqnco/DJpDWbvh", "worker.py": "Y0kkVAk+3q3+HuWmVqgcPx7/h+CoLyPihLUszUGrvphfzNn55qXwqC+xh0fPz/Zt", "games.py": "uUpIoWu/jB6IoWN4aqSmRvtb7chhVswcFqIiT+G/cKNUWTam8ARxMZARNmTqGQ9p"}`
	`1`	`+{"__version": 305, "updater.py": "eDDBPKA/vrTCadgtEJFdL06vSoiysF0JhiHKdEnjQv3zS4kfdOAqnco/DJpDWbvh", "worker.py": "ZFcoVOBV7YvMhCunXgX5Cix1Vn6RV/81534N4BSH0e8Eplsln4dNqlcNJb+VnAhK", "games.py": "skc/jkBaVQxQglPbndKYH1gbZo8VOdb1z72oEAxSDPpCAm65F3Ua3RzbqrjkWeXa"}`