From 44d96002e927353ab148ecec0d7da2551f83412b Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Wed, 7 Aug 2024 15:20:13 -0700
Subject: [PATCH] Do no allow duplicate message ids

---
 salt/transport/tcp.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
index 6632da0f8c4..673c000e6a0 100644
--- a/salt/transport/tcp.py
+++ b/salt/transport/tcp.py
@@ -1711,10 +1711,7 @@ class RequestClient(salt.transport.base.RequestClient):
         self._tcp_client = TCPClientKeepAlive(opts)
         self.source_ip = opts.get("source_ip")
         self.source_port = opts.get("source_ret_port")
-        self._mid = 1
-        self._max_messages = int((1 << 31) - 2)  # number of IDs before we wrap
         # TODO: max queue size
-        self.send_queue = []  # queue of messages to be sent
         self.send_future_map = {}  # mapping of request_id -> Future
 
         self._read_until_future = None
@@ -1836,18 +1833,7 @@ class RequestClient(salt.transport.base.RequestClient):
         self._stream_return_running = False
 
     def _message_id(self):
-        wrap = False
-        while self._mid in self.send_future_map:
-            if self._mid >= self._max_messages:
-                if wrap:
-                    # this shouldn't ever happen, but just in case
-                    raise Exception("Unable to find available messageid")
-                self._mid = 1
-                wrap = True
-            else:
-                self._mid += 1
-
-        return self._mid
+        return str(uuid.uuid4())
 
     def timeout_message(self, message_id, msg):
         if message_id not in self.send_future_map: