Shut down the DNS threadpool

The DNS threadpool must be explicitly stopped, otherwise Synapse will hang indefinitely when asked to shut down.
matrix-org · Oct 27, 2021 · e6a477d · e6a477d
1 parent 2dbef6c
commit e6a477d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/changelog.d/11190.bugfix b/changelog.d/11190.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.46.0rc1 that prevented Synapse from shutting down cleanly.
diff --git a/synapse/app/_base.py b/synapse/app/_base.py
@@ -346,6 +346,7 @@ async def start(hs: "HomeServer"):
     # numbers of DNS requests don't starve out other users of the threadpool.
     resolver_threadpool = ThreadPool(name="gai_resolver")
     resolver_threadpool.start()
+    reactor.addSystemEventTrigger("during", "shutdown", resolver_threadpool.stop)
     reactor.installNameResolver(
         GAIResolver(reactor, getThreadPool=lambda: resolver_threadpool)
     )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug introduced in 1.46.0rc1 that prevented Synapse from shutting down cleanly.