Remove actor handle IDs (#5889)

* 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
2026-07-15 11:25:40 +08:00 · 2019-10-17 12:36:34 -04:00
parent d70abcfd70
commit 3ac8592dcf
37 changed files with 507 additions and 656 deletions
@@ -8,7 +8,6 @@ from libcpp.vector cimport vector as c_vector

 from ray.includes.unique_ids cimport (
    CActorID,
-    CActorHandleID,
    CJobID,
    CWorkerID,
    CObjectID,
@@ -199,19 +198,9 @@ cdef extern from "ray/core_worker/task_interface.h" nogil:
            const c_vector[c_string] &dynamic_worker_options)

    cdef cppclass CActorHandle "ray::ActorHandle":
-        CActorHandle(
-            const CActorID &actor_id, const CActorHandleID &actor_handle_id,
-            const CJobID &job_id, const CObjectID &initial_cursor,
-            const CLanguage actor_language, c_bool is_direct_call,
-            const c_vector[c_string] &actor_creation_task_function_descriptor)
-        CActorHandle(CActorHandle &other, c_bool in_band)
-        CActorHandle(
-            const c_string &serialized, const CTaskID &current_task_id)
+        CActorHandle(const c_string &serialized)

        CActorID GetActorID() const
-        CActorHandleID GetActorHandleID() const
-        unique_ptr[CActorHandle] Fork()
-        unique_ptr[CActorHandle] ForkForSerialization()
        void Serialize(c_string *output)

 cdef extern from "ray/gcs/gcs_client_interface.h" nogil:
@@ -3,7 +3,6 @@ from libcpp.string cimport string as c_string
 from libcpp.vector cimport vector as c_vector

 from ray.includes.common cimport (
-    CActorHandle,
    CGcsClientOptions,
 )

@@ -25,48 +24,3 @@ cdef class GcsClientOptions:

    cdef CGcsClientOptions* native(self):
        return <CGcsClientOptions*>(self.inner.get())
-
-cdef class ActorHandle:
-    """Cython wrapper class of C++ `ray::ActorHandle`."""
-    cdef:
-        unique_ptr[CActorHandle] inner
-
-    def __init__(self, ActorID actor_id, ActorHandleID actor_handle_id,
-                 JobID job_id, list creation_function_descriptor):
-        cdef:
-            c_vector[c_string] c_descriptor
-            ObjectID cursor = ObjectID.from_random()
-
-        c_descriptor = string_vector_from_list(creation_function_descriptor)
-        self.inner.reset(new CActorHandle(
-            actor_id.native(), actor_handle_id.native(), job_id.native(),
-            cursor.native(), LANGUAGE_PYTHON, False, c_descriptor))
-
-    def fork(self, c_bool ray_forking):
-        cdef:
-            ActorHandle other = ActorHandle.__new__(ActorHandle)
-        if ray_forking:
-            other.inner = self.inner.get().Fork()
-        else:
-            other.inner = self.inner.get().ForkForSerialization()
-        return other
-
-    @staticmethod
-    def from_bytes(c_string bytes, TaskID current_task_id):
-        cdef:
-            ActorHandle self = ActorHandle.__new__(ActorHandle)
-        self.inner.reset(new CActorHandle(bytes, current_task_id.native()))
-        return self
-
-    def to_bytes(self):
-        cdef:
-            c_string output
-
-        self.inner.get().Serialize(&output)
-        return output
-
-    def actor_id(self):
-        return ActorID(self.inner.get().GetActorID().Binary())
-
-    def actor_handle_id(self):
-        return ActorHandleID(self.inner.get().GetActorHandleID().Binary())
@@ -5,6 +5,7 @@ from libcpp.string cimport string as c_string
 from libcpp.vector cimport vector as c_vector

 from ray.includes.unique_ids cimport (
+    CActorID,
    CJobID,
    CTaskID,
    CObjectID,
@@ -32,13 +33,16 @@ cdef extern from "ray/core_worker/profiling.h" nogil:
 cdef extern from "ray/core_worker/task_interface.h" namespace "ray" nogil:
    cdef cppclass CTaskSubmissionInterface "CoreWorkerTaskInterface":
        CRayStatus SubmitTask(
+            const CTaskID &caller_id,
            const CRayFunction &function, const c_vector[CTaskArg] &args,
            const CTaskOptions &options, c_vector[CObjectID] *return_ids)
        CRayStatus CreateActor(
+            const CTaskID &caller_id,
            const CRayFunction &function, const c_vector[CTaskArg] &args,
            const CActorCreationOptions &options,
            unique_ptr[CActorHandle] *handle)
        CRayStatus SubmitActorTask(
+            const CTaskID &caller_id,
            CActorHandle &handle, const CRayFunction &function,
            const c_vector[CTaskArg] &args, const CTaskOptions &options,
            c_vector[CObjectID] *return_ids)
@@ -87,3 +91,8 @@ cdef extern from "ray/core_worker/core_worker.h" nogil:
        void SetCurrentJobId(const CJobID &job_id)
        CTaskID GetCurrentTaskId()
        void SetCurrentTaskId(const CTaskID &task_id)
+        void SetActorId(const CActorID &actor_id)
+        const CActorID &GetActorId()
+        CTaskID GetCallerId()
+        c_bool AddActorHandle(unique_ptr[CActorHandle] handle)
+        CActorHandle &GetActorHandle(const CActorID &actor_id)
@@ -10,7 +10,6 @@ from ray.includes.common cimport (
    ResourceSet,
 )
 from ray.includes.unique_ids cimport (
-    CActorHandleID,
    CActorID,
    CJobID,
    CObjectID,
@@ -71,10 +70,8 @@ cdef extern from "ray/common/task/task_spec.h" nogil:
        CObjectID PreviousActorTaskDummyObjectId() const
        uint64_t MaxActorReconstructions() const
        CActorID ActorId() const
-        CActorHandleID ActorHandleId() const
        uint64_t ActorCounter() const
        CObjectID ActorDummyObject() const
-        c_vector[CActorHandleID] NewActorHandles() const


 cdef extern from "ray/common/task/task_execution_spec.h" nogil:
@@ -68,11 +68,6 @@ cdef extern from "ray/common/id.h" namespace "ray" nogil:
        CActorID Of(CJobID job_id, CTaskID parent_task_id,
                    int64_t parent_task_counter)

-    cdef cppclass CActorHandleID "ray::ActorHandleID"(CUniqueID):
-
-        @staticmethod
-        CActorHandleID FromBinary(const c_string &binary)
-
    cdef cppclass CClientID "ray::ClientID"(CUniqueID):

        @staticmethod
@@ -11,7 +11,6 @@ import os
 from ray.includes.unique_ids cimport (
    CActorCheckpointID,
    CActorClassID,
-    CActorHandleID,
    CActorID,
    CClientID,
    CConfigID,
@@ -343,16 +342,6 @@ cdef class ActorID(BaseID):
        return self.data.Hash()


-cdef class ActorHandleID(UniqueID):
-
-    def __init__(self, id):
-        check_id(id)
-        self.data = CActorHandleID.FromBinary(<c_string>id)
-
-    cdef CActorHandleID native(self):
-        return <CActorHandleID>self.data
-
-
 cdef class ActorCheckpointID(UniqueID):

    def __init__(self, id):
@@ -385,7 +374,6 @@ cdef class ActorClassID(UniqueID):
 _ID_TYPES = [
    ActorCheckpointID,
    ActorClassID,
-    ActorHandleID,
    ActorID,
    ClientID,
    JobID,