Add lock in fetch_and_execute_function_to_run of import_thread.py (#4718

)
ray-project · Apr 30, 2019 · 448a7bd · 448a7bd
1 parent 4eade03
commit 448a7bd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/python/ray/import_thread.py b/python/ray/import_thread.py
@@ -124,8 +124,11 @@ def fetch_and_execute_function_to_run(self, key):
  return
 
  try:
- # Deserialize the function.
- function = pickle.loads(serialized_function)
+ # FunctionActorManager may call pickle.loads at the same time.
+ # Importing the same module in different threads causes deadlock.
+ with self.worker.function_actor_manager.lock:
+ # Deserialize the function.
+ function = pickle.loads(serialized_function)
  # Run the function.
  function({"worker": self.worker})
  except Exception: