wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-20 12:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove actor handle IDs (#5889)

Browse Source 
* Remove actor handle ID from main ActorHandle constructor

* Set the actor caller ID when calling submit task instead of in the actor handle

* Remove ActorHandle::Fork, remove actor handle ID from protobuf

* Make inner actor handle const, remove new_actor_handles

* Move caller ID into the common task spec, start refactoring raylet

* Some fixes for forking actor handles

* Store ActorHandle state in CoreWorker, only expose actor ID to Python

* Remove some unused fields

* lint

* doc

* fix merge

* Remove ActorHandleID from python/cpp

* doc

* Fix core worker test

* Move actor table subscription to CoreWorker, reset actor handles on actor failure

* lint

* Remove GCS client from direct actor

* fix tests

* Fix

* Fix tests for raylet codepath

* Fix local mode

* Fix multithreaded test

* Fix AsyncSubscribe issue...

* doc

* fix serve

* Revert bazel
This commit is contained in:
Stephanie Wang
2019-10-17 12:36:34 -04:00
committed by GitHub
parent d70abcfd70
commit 3ac8592dcf
37 changed files with 507 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/actor.py
+19 -20
View File
@@ -16,7 +16,7 @@ import ray.ray_constants as ray_constants
import ray._raylet
import ray.signature as signature
import ray.worker
from ray import ActorID, ActorHandleID, ActorClassID, profiling
from ray import ActorID, ActorClassID, profiling
logger = logging.getLogger(__name__)
@@ -372,9 +372,6 @@ class ActorClass(object):
actor_id = ActorID.from_random()
worker.actors[actor_id] = meta.modified_class(
*copy.deepcopy(args), **copy.deepcopy(kwargs))
core_handle = ray._raylet.ActorHandle(
actor_id, ActorHandleID.nil(), worker.current_job_id,
function_descriptor.get_function_descriptor_list())
else:
# Export the actor.
if (meta.last_export_session_and_job !=
@@ -404,13 +401,13 @@ class ActorClass(object):
function_signature = meta.method_signatures[function_name]
creation_args = signature.extend_args(function_signature, args,
kwargs)
core_handle = worker.core_worker.create_actor(
actor_id = worker.core_worker.create_actor(
function_descriptor.get_function_descriptor_list(),
creation_args, meta.max_reconstructions, resources,
actor_placement_resources)
actor_handle = ActorHandle(
core_handle,
actor_id,
meta.modified_class.__module__,
meta.class_name,
meta.actor_method_names,
@@ -436,7 +433,7 @@ class ActorHandle(object):
cloudpickle).
Attributes:
_ray_core_handle: Core worker actor handle for this actor.
_ray_actor_id: Actor ID.
_ray_module_name: The module name of this actor.
_ray_actor_method_names: The names of the actor methods.
_ray_method_decorators: Optional decorators for the function
@@ -454,7 +451,7 @@ class ActorHandle(object):
"""
def __init__(self,
core_handle,
actor_id,
module_name,
class_name,
actor_method_names,
@@ -464,7 +461,7 @@ class ActorHandle(object):
actor_method_cpus,
session_and_job,
original_handle=False):
self._ray_core_handle = core_handle
self._ray_actor_id = actor_id
self._ray_module_name = module_name
self._ray_original_handle = original_handle
self._ray_actor_method_names = actor_method_names
@@ -518,7 +515,7 @@ class ActorHandle(object):
function, function_descriptor, args, num_return_vals)
else:
object_ids = worker.core_worker.submit_actor_task(
self._ray_core_handle,
self._ray_actor_id,
function_descriptor.get_function_descriptor_list(), args,
num_return_vals, {"CPU": self._ray_actor_method_cpus})
@@ -579,8 +576,8 @@ class ActorHandle(object):
# and we don't need to send `__ray_terminate__` again.
logger.warning(
"Actor is garbage collected in the wrong driver." +
" Actor id = %s, class name = %s.",
self._ray_core_handle.actor_id(), self._ray_class_name)
" Actor id = %s, class name = %s.", self._ray_actor_id,
self._ray_class_name)
return
if worker.connected and self._ray_original_handle:
# TODO(rkn): Should we be passing in the actor cursor as a
@@ -589,11 +586,7 @@ class ActorHandle(object):
@property
def _actor_id(self):
return self._ray_core_handle.actor_id()
@property
def _actor_handle_id(self):
return self._ray_core_handle.actor_handle_id()
return self._ray_actor_id
def _serialization_helper(self, ray_forking):
"""This is defined in order to make pickling work.
@@ -605,8 +598,13 @@ class ActorHandle(object):
Returns:
A dictionary of the information needed to reconstruct the object.
"""
worker = ray.worker.get_global_worker()
worker.check_connected()
state = {
"core_handle": self._ray_core_handle.fork(ray_forking).to_bytes(),
# Local mode just uses the actor ID.
"core_handle": worker.core_worker.serialize_actor_handle(
self._ray_actor_id)
if hasattr(worker, "core_worker") else self._ray_actor_id,
"module_name": self._ray_module_name,
"class_name": self._ray_class_name,
"actor_method_names": self._ray_actor_method_names,
@@ -632,8 +630,9 @@ class ActorHandle(object):
self.__init__(
# TODO(swang): Accessing the worker's current task ID is not
# thread-safe.
ray._raylet.ActorHandle.from_bytes(state["core_handle"],
worker.current_task_id),
# Local mode just uses the actor ID.
worker.core_worker.deserialize_actor_handle(state["core_handle"])
if hasattr(worker, "core_worker") else state["core_handle"],
state["module_name"],
state["class_name"],
state["actor_method_names"],