Fix 66568: Prevent unclosed TCP channels and avoid additional errors

Author: saville

changelog/66568.fixed.md

@@ -0,0 +1 @@
+Fix closing of TCP transport channels and avoid additional errors

salt/channel/client.py

@@ -559,7 +559,8 @@ def connect_callback(self, result):
             # may have been restarted
             yield self.send_id(self.token, self._reconnected)
             self.connected = True
-            self.event.fire_event({"master": self.opts["master"]}, "__master_connected")
+            if self.event:
+                self.event.fire_event({"master": self.opts["master"]}, "__master_connected")
             if self._reconnected:
                 # On reconnects, fire a master event to notify that the minion is
                 # available.

salt/transport/tcp.py

@@ -224,7 +224,6 @@ def __init__(self, opts, io_loop, **kwargs):  # pylint: disable=W0231
         self.connected = False
         self._closing = False
         self._stream = None
-        self._closing = False
         self._closed = False
         self.backoff = opts.get("tcp_reconnect_backoff", 1)
         self.resolver = kwargs.get("resolver")
@@ -1728,6 +1727,10 @@ def __init__(self, opts, io_loop, **kwargs):  # pylint: disable=W0231
         self.backoff = opts.get("tcp_reconnect_backoff", 1)
         self.ssl = self.opts.get("ssl", None)
 
+    # pylint: disable=W1701
+    def __del__(self):
+        self.close()
+
     async def getstream(self, **kwargs):
         if self.source_ip or self.source_port:
             kwargs.update(source_ip=self.source_ip, source_port=self.source_port)
@@ -1791,7 +1794,7 @@ async def _stream_return(self):
                                 message_id,
                             )
             except tornado.iostream.StreamClosedError as e:
-                log.error(
+                log.debug(
                     "tcp stream to %s:%s closed, unable to recv",
                     self.host,
                     self.port,