saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Do no allow duplicate message ids

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-08-07 15:20:13 -07:00 • committed by Daniel Wozniak
parent ef3d8f7840
commit 44d96002e9
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/transport/tcp.py
View file

@ -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: