use function_actor_manager.lock when deserializing

ray-project · Jun 6, 2021 · ae066c7 · ae066c7
1 parent b88163f
commit ae066c7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/python/ray/worker.py b/python/ray/worker.py
@@ -289,16 +289,17 @@ def put_object(self, value, object_ref=None):
  serialized_value, object_ref=object_ref))
 
  def raise_errors(self, data_metadata_pairs, object_refs):
- context = self.get_serialization_context()
- out = context.deserialize_objects(data_metadata_pairs, object_refs)
+ out = self.deserialize_objects(data_metadata_pairs, object_refs)
  if "RAY_IGNORE_UNHANDLED_ERRORS" in os.environ:
  return
  for e in out:
  _unhandled_error_handler(e)
 
  def deserialize_objects(self, data_metadata_pairs, object_refs):
- context = self.get_serialization_context()
- return context.deserialize_objects(data_metadata_pairs, object_refs)
+ with self.function_actor_manager.lock:
+ context = self.get_serialization_context()
+ return context.deserialize_objects(data_metadata_pairs,
+ object_refs)
 
  def get_objects(self, object_refs, timeout=None):
  """Get the values in the object store associated with the IDs.