From 4fcb2fc254584d878ba1d2e914ea2f1cc355857d Mon Sep 17 00:00:00 2001
From: IlyaKhalafi <ilyakhalafi@yahoo.com>
Date: Mon, 19 Oct 2026 14:58:37 +0000
Subject: [PATCH] Release ZeroMQ resources during shutdown

---
 taskiq/brokers/zmq_broker.py       |  14 +++-
 tests/brokers/test_zmq_shutdown.py | 101 +++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 tests/brokers/test_zmq_shutdown.py

diff --git a/taskiq/brokers/zmq_broker.py b/taskiq/brokers/zmq_broker.py
index cb608cd4..23c07744 100644
--- a/taskiq/brokers/zmq_broker.py
+++ b/taskiq/brokers/zmq_broker.py
@@ -54,6 +54,9 @@ async def startup(self) -> None:
         sockets. if current process is worker,
         it subscribes, otherwise it becomes publisher.
         """
+        if self.context.closed:
+            self.context = Context()
+
         if self.is_worker_process:
             self.socket = self.context.socket(zmq.SUB)
             self.socket.setsockopt(zmq.SUBSCRIBE, b"")
@@ -68,9 +71,14 @@ async def shutdown(self) -> None:
 
         This function closes actual connections to sockets
         """
-        if not self.is_worker_process:
-            self.socket.unbind(self.pub_host)
-        return await super().shutdown()
+        try:
+            if not self.is_worker_process:
+                # Unbind can start terminating TCP sessions with the current linger.
+                self.socket.setsockopt(zmq.LINGER, 0)
+                self.socket.unbind(self.pub_host)
+            await super().shutdown()
+        finally:
+            self.context.destroy(linger=0)
 
     async def kick(self, message: BrokerMessage) -> None:
         """
diff --git a/tests/brokers/test_zmq_shutdown.py b/tests/brokers/test_zmq_shutdown.py
new file mode 100644
index 00000000..1db7bfa8
--- /dev/null
+++ b/tests/brokers/test_zmq_shutdown.py
@@ -0,0 +1,101 @@
+import asyncio
+
+import pytest
+
+from taskiq.brokers import zmq_broker
+from taskiq.events import TaskiqEvents
+from taskiq.state import TaskiqState
+
+pytestmark = [
+    pytest.mark.anyio,
+    pytest.mark.skipif(zmq_broker.zmq is None, reason="pyzmq is not installed"),
+]
+
+
+@pytest.mark.parametrize("is_worker", [False, True])
+@pytest.mark.parametrize("failure_stage", [None, "handler", "backend"])
+async def test_shutdown_releases_zmq_resources(
+    monkeypatch: pytest.MonkeyPatch,
+    is_worker: bool,
+    failure_stage: str | None,
+) -> None:
+    broker = zmq_broker.ZeroMQBroker(zmq_pub_host="inproc://taskiq-shutdown-test")
+    broker.is_worker_process = is_worker
+    event = TaskiqEvents.WORKER_SHUTDOWN if is_worker else TaskiqEvents.CLIENT_SHUTDOWN
+    called = []
+
+    async def shutdown_handler(state: TaskiqState) -> None:
+        called.append("handler")
+        if failure_stage == "handler":
+            raise RuntimeError("shutdown handler failed")
+
+    async def shutdown_backend() -> None:
+        called.append("backend")
+        if failure_stage == "backend":
+            raise RuntimeError("shutdown backend failed")
+
+    broker.event_handlers[event].append(shutdown_handler)
+    monkeypatch.setattr(broker.result_backend, "shutdown", shutdown_backend)
+
+    try:
+        await broker.startup()
+        assert not broker.socket.closed
+        assert not broker.context.closed
+
+        if failure_stage is None:
+            await broker.shutdown()
+        else:
+            with pytest.raises(RuntimeError, match=f"shutdown {failure_stage} failed"):
+                await broker.shutdown()
+
+        assert called == (
+            ["handler"] if failure_stage == "handler" else ["handler", "backend"]
+        )
+        assert broker.socket.closed
+        assert broker.context.closed
+    finally:
+        broker.context.destroy(linger=0)
+
+
+@pytest.mark.parametrize("is_worker", [False, True])
+async def test_zmq_broker_can_restart(is_worker: bool) -> None:
+    broker = zmq_broker.ZeroMQBroker(zmq_pub_host="inproc://taskiq-restart-test")
+    broker.is_worker_process = is_worker
+
+    try:
+        for _ in range(2):
+            await broker.startup()
+            assert not broker.socket.closed
+            assert not broker.context.closed
+            await broker.shutdown()
+            assert broker.socket.closed
+            assert broker.context.closed
+    finally:
+        broker.context.destroy(linger=0)
+
+
+async def test_shutdown_closes_suspended_listener() -> None:
+    broker = zmq_broker.ZeroMQBroker(
+        zmq_sub_host="inproc://taskiq-listener-shutdown-test",
+    )
+    broker.is_worker_process = True
+    await broker.startup()
+    listener = broker.listen()
+    pending = asyncio.create_task(anext(listener))
+
+    try:
+        await asyncio.sleep(0)
+        assert not pending.done()
+
+        await broker.shutdown()
+
+        with pytest.raises(asyncio.CancelledError):
+            await pending
+        await listener.aclose()
+        assert broker.socket.closed
+        assert broker.context.closed
+    finally:
+        pending.cancel()
+        await asyncio.gather(pending, return_exceptions=True)
+        await listener.aclose()
+        broker.context.destroy(linger=0)