Fix reset variables in thread safe way.

ray-project · Jul 5, 2023 · fcdb0a3 · fcdb0a3
1 parent 204a0a3
commit fcdb0a3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/fed/cleanup.py b/fed/cleanup.py
@@ -67,10 +67,6 @@ def _signal_exit():
             break
 
     logger.info('Check sending thread was exited.')
-    global _check_send_thread
-    _check_send_thread = None
-    logger.info('Clearing sending queue.')
-    _sending_obj_refs_q = None
 
 
 def _main_thread_monitor():
@@ -117,3 +113,9 @@ def wait_sending():
     if _check_send_thread:
         notify_to_exit()
         _check_send_thread.join()
+        _check_send_thread = None
+
+        # It's safe to reset `_sending_obj_refs_q` as another
+        # thread is stoped.
+        global _sending_obj_refs_q
+        _sending_obj_refs_q = None