From e521194579d97ae582427c2872eb804dd69eaa27 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Sat, 27 May 2023 15:27:19 -0700
Subject: [PATCH] make_current is deprecated, remove it

---
 salt/engines/ircbot.py     | 3 +--
 salt/engines/webhook.py    | 3 +--
 salt/master.py             | 1 -
 salt/transport/tcp.py      | 1 -
 salt/transport/zeromq.py   | 1 -
 salt/utils/asynchronous.py | 7 ++++---
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/salt/engines/ircbot.py b/salt/engines/ircbot.py
index 6126b2c1076..3e134c4e8b9 100644
--- a/salt/engines/ircbot.py
+++ b/salt/engines/ircbot.py
@@ -102,8 +102,7 @@ class IRCClient:
         self.allow_hosts = allow_hosts
         self.allow_nicks = allow_nicks
         self.disable_query = disable_query
-        self.io_loop = tornado.ioloop.IOLoop(make_current=False)
-        self.io_loop.make_current()
+        self.io_loop = tornado.ioloop.IOLoop()
         self._connect()
 
     def _connect(self):
diff --git a/salt/engines/webhook.py b/salt/engines/webhook.py
index ea7a60b481f..a970ebf549e 100644
--- a/salt/engines/webhook.py
+++ b/salt/engines/webhook.py
@@ -78,8 +78,7 @@ def start(address=None, port=5000, ssl_crt=None, ssl_key=None):
     ssl_options = None
     if all([ssl_crt, ssl_key]):
         ssl_options = {"certfile": ssl_crt, "keyfile": ssl_key}
-    io_loop = tornado.ioloop.IOLoop(make_current=False)
-    io_loop.make_current()
+    io_loop = tornado.ioloop.IOLoop()
     http_server = tornado.httpserver.HTTPServer(application, ssl_options=ssl_options)
     http_server.listen(port, address=address)
     io_loop.start()
diff --git a/salt/master.py b/salt/master.py
index 33c8de076aa..97ea8dcb5af 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1000,7 +1000,6 @@ class MWorker(salt.utils.process.SignalHandlingProcess):
         Bind to the local port
         """
         self.io_loop = tornado.ioloop.IOLoop()
-        self.io_loop.make_current()
         for req_channel in self.req_channels:
             req_channel.post_fork(
                 self._handle_payload, io_loop=self.io_loop
diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
index 9c868d6e7cf..835f9db2d5b 100644
--- a/salt/transport/tcp.py
+++ b/salt/transport/tcp.py
@@ -968,7 +968,6 @@ class TCPPublishServer(salt.transport.base.DaemonizedPublishServer):
         Bind to the interface specified in the configuration file
         """
         io_loop = tornado.ioloop.IOLoop()
-        io_loop.make_current()
 
         # Spin up the publisher
         self.pub_server = pub_server = PubServer(
diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
index 5effe0d6fa8..50c2a66deaa 100644
--- a/salt/transport/zeromq.py
+++ b/salt/transport/zeromq.py
@@ -713,7 +713,6 @@ class PublishServer(salt.transport.base.DaemonizedPublishServer):
         run in a thread or process as it creates and runs an it's own ioloop.
         """
         ioloop = tornado.ioloop.IOLoop()
-        ioloop.make_current()
         self.io_loop = ioloop
         context = zmq.Context(1)
         pub_sock = context.socket(zmq.PUB)
diff --git a/salt/utils/asynchronous.py b/salt/utils/asynchronous.py
index 0b7ac540a92..55505480bc2 100644
--- a/salt/utils/asynchronous.py
+++ b/salt/utils/asynchronous.py
@@ -3,6 +3,7 @@ Helpers/utils for working with tornado asynchronous stuff
 """
 
 
+import asyncio
 import contextlib
 import logging
 import sys
@@ -23,14 +24,14 @@ def current_ioloop(io_loop):
         orig_loop = tornado.ioloop.IOLoop.current()
     except RuntimeError:
         orig_loop = None
-    io_loop.make_current()
+    asyncio.set_event_loop(io_loop.asyncio_loop)
     try:
         yield
     finally:
         if orig_loop:
-            orig_loop.make_current()
+            asyncio.set_event_loop(orig_loop.asyncio_loop)
         else:
-            io_loop.clear_current()
+            asyncio.set_event_loop(None)
 
 
 class SyncWrapper: