From 50241a922fec63153723ef7cd5935883898e6b86 Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Mon, 5 Nov 2018 14:28:19 +0000
Subject: [PATCH] ansible: call on_fork() on broker shutdown; closes #420.

---
 ansible_mitogen/connection.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py
index f14576ad..569a5ad8 100644
--- a/ansible_mitogen/connection.py
+++ b/ansible_mitogen/connection.py
@@ -42,6 +42,7 @@ import ansible.errors
 import ansible.plugins.connection
 import ansible.utils.shlex
 
+import mitogen.fork
 import mitogen.unix
 import mitogen.utils
 
@@ -802,19 +803,32 @@ class Connection(ansible.plugins.connection.ConnectionBase):
         self.init_child_result = None
         self.chain = None
 
-    def close(self):
+    def _shutdown_broker(self):
         """
-        Arrange for the mitogen.master.Router running in the worker to
-        gracefully shut down, and wait for shutdown to complete. Safe to call
-        multiple times.
+        Shutdown the broker thread during :meth:`close` or :meth:`reset`.
         """
-        self._mitogen_reset(mode='put')
         if self.broker:
             self.broker.shutdown()
             self.broker.join()
             self.broker = None
             self.router = None
 
+        # #420: Ansible executes "meta" actions in the top-level process,
+        # meaning "reset_connection" will cause :class:`mitogen.core.Latch` FDs
+        # to be cached and subsequently erroneously shared by children on
+        # subsequent task forks. To handle that, call on_fork() to ensure any
+        # shared state is discarded.
+        mitogen.fork.on_fork()
+
+    def close(self):
+        """
+        Arrange for the mitogen.master.Router running in the worker to
+        gracefully shut down, and wait for shutdown to complete. Safe to call
+        multiple times.
+        """
+        self._mitogen_reset(mode='put')
+        self._shutdown_broker()
+
     reset_compat_msg = (
         'Mitogen only supports "reset_connection" on Ansible 2.5.6 or later'
     )
@@ -835,6 +849,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
 
         self._connect()
         self._mitogen_reset(mode='reset')
+        self._shutdown_broker()
 
     # Compatibility with Ansible 2.4 wait_for_connection plug-in.
     _reset = reset