From: Sam Gross <colesbury@gmail.com>
Date: Thu, 25 Jul 2024 08:16:53 +0000 (-0400)
Subject: gh-122187: Avoid TSan reported race in `run_udp_echo_server` (#122189)
X-Git-Tag: v3.14.0a1~995
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f74b709b637cad7a9c18a2d90b0747823f2ff51;p=thirdparty%2FPython%2Fcpython.git

gh-122187: Avoid TSan reported race in `run_udp_echo_server` (#122189)

TSan doesn't fully recognize the synchronization via I/O, so ensure that
socket name is retrieved earlier and use a different socket for sending
the "STOP" message.
---

diff --git a/Lib/test/test_asyncio/utils.py b/Lib/test/test_asyncio/utils.py
index dbb8d27c1769..35893ab3118e 100644
--- a/Lib/test/test_asyncio/utils.py
+++ b/Lib/test/test_asyncio/utils.py
@@ -301,12 +301,17 @@ def run_udp_echo_server(*, host='127.0.0.1', port=0):
     family, type, proto, _, sockaddr = addr_info[0]
     sock = socket.socket(family, type, proto)
     sock.bind((host, port))
+    sockname = sock.getsockname()
     thread = threading.Thread(target=lambda: echo_datagrams(sock))
     thread.start()
     try:
-        yield sock.getsockname()
+        yield sockname
     finally:
-        sock.sendto(b'STOP', sock.getsockname())
+        # gh-122187: use a separate socket to send the stop message to avoid
+        # TSan reported race on the same socket.
+        sock2 = socket.socket(family, type, proto)
+        sock2.sendto(b'STOP', sockname)
+        sock2.close()
         thread.join()