Report ExitFailures from cluster worker exits

amphp · Dec 20, 2024 · 332ed6d · 332ed6d
1 parent 0b050b1
commit 332ed6d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Internal/ContextClusterWorker.php b/src/Internal/ContextClusterWorker.php
@@ -109,7 +109,16 @@ public function run(): void
                 };
             }
 
-            $this->joinFuture->await(new TimeoutCancellation(ClusterWatcher::WORKER_TIMEOUT));
+            try {
+                $result = $this->joinFuture->await(new TimeoutCancellation(ClusterWatcher::WORKER_TIMEOUT));
+            } catch (CancelledException) {
+                $this->close();
+                // Give it a second to reap the result. Generally this never should time out, unless something is seriously broken.
+                $result = $this->joinFuture->await(new TimeoutCancellation(0.001));
+            }
+            if ($result instanceof \Throwable) {
+                throw $result;
+            }
         } catch (\Throwable $exception) {
             $this->joinFuture->ignore();
             throw $exception;