Skip to content

Commit 8561936

Browse files
authored
[core] Remove usages of vestigial "direct" call terminology (#52741)
There haven't been non-direct actor calls for years, so this is unnecessary mental burden. --------- Signed-off-by: Edward Oakes <ed.nmi.oakes@gmail.com>
1 parent 96a632d commit 8561936

File tree

21 files changed

+107
-112
lines changed

21 files changed

+107
-112
lines changed

src/mock/ray/core_worker/core_worker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class MockCoreWorker : public CoreWorker {
2929
rpc::SendReplyCallback send_reply_callback),
3030
(override));
3131
MOCK_METHOD(void,
32-
HandleDirectActorCallArgWaitComplete,
33-
(rpc::DirectActorCallArgWaitCompleteRequest request,
34-
rpc::DirectActorCallArgWaitCompleteReply *reply,
32+
HandleActorCallArgWaitComplete,
33+
(rpc::ActorCallArgWaitCompleteRequest request,
34+
rpc::ActorCallArgWaitCompleteReply *reply,
3535
rpc::SendReplyCallback send_reply_callback),
3636
(override));
3737
MOCK_METHOD(void,

src/mock/ray/raylet/worker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MockWorkerInterface : public WorkerInterface {
5656
MOCK_METHOD(const std::shared_ptr<ClientConnection>, Connection, (), (const, override));
5757
MOCK_METHOD(void, SetOwnerAddress, (const rpc::Address &address), (override));
5858
MOCK_METHOD(const rpc::Address &, GetOwnerAddress, (), (const, override));
59-
MOCK_METHOD(void, DirectActorCallArgWaitComplete, (int64_t tag), (override));
59+
MOCK_METHOD(void, ActorCallArgWaitComplete, (int64_t tag), (override));
6060
MOCK_METHOD(const BundleID &, GetBundleId, (), (const, override));
6161
MOCK_METHOD(void, SetBundleId, (const BundleID &bundle_id), (override));
6262
MOCK_METHOD(void,

src/mock/ray/raylet_client/raylet_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace ray {
1717
class MockRayletClientInterface : public RayletClientInterface {
1818
public:
1919
MOCK_METHOD(ray::Status,
20-
WaitForDirectActorCallArgs,
20+
WaitForActorCallArgs,
2121
(const std::vector<rpc::ObjectReference> &references, int64_t tag),
2222
(override));
2323
MOCK_METHOD(std::shared_ptr<grpc::Channel>, GetChannel, (), (const));

src/mock/ray/rpc/worker/core_worker_client.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class MockCoreWorkerClientInterface : public ray::pubsub::MockSubscriberClientIn
3636
int64_t timeout_ms),
3737
(override));
3838
MOCK_METHOD(void,
39-
DirectActorCallArgWaitComplete,
40-
(const DirectActorCallArgWaitCompleteRequest &request,
41-
const ClientCallback<DirectActorCallArgWaitCompleteReply> &callback),
39+
ActorCallArgWaitComplete,
40+
(const ActorCallArgWaitCompleteRequest &request,
41+
const ClientCallback<ActorCallArgWaitCompleteReply> &callback),
4242
(override));
4343
MOCK_METHOD(void,
4444
GetObjectStatus,

src/ray/core_worker/context.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,9 @@ TaskID WorkerContext::GetMainThreadOrActorCreationTaskID() const {
385385
bool WorkerContext::ShouldReleaseResourcesOnBlockingCalls() const {
386386
// Check if we need to release resources when we block:
387387
// - Driver doesn't acquire resources and thus doesn't need to release.
388-
// - We only support lifetime resources for direct actors, which can be
388+
// - We only support lifetime resources for actors, which can be
389389
// acquired when the actor is created, per call resources are not supported,
390-
// thus we don't need to release resources for direct actor call.
390+
// thus we don't need to release resources for actor calls.
391391
return worker_type_ != WorkerType::DRIVER && !CurrentActorIsDirectCall() &&
392392
CurrentThreadIsMain();
393393
}

src/ray/core_worker/core_worker.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3904,9 +3904,9 @@ void CoreWorker::HandlePushTask(rpc::PushTaskRequest request,
39043904
}
39053905
}
39063906

3907-
void CoreWorker::HandleDirectActorCallArgWaitComplete(
3908-
rpc::DirectActorCallArgWaitCompleteRequest request,
3909-
rpc::DirectActorCallArgWaitCompleteReply *reply,
3907+
void CoreWorker::HandleActorCallArgWaitComplete(
3908+
rpc::ActorCallArgWaitCompleteRequest request,
3909+
rpc::ActorCallArgWaitCompleteReply *reply,
39103910
rpc::SendReplyCallback send_reply_callback) {
39113911
if (HandleWrongRecipient(WorkerID::FromBinary(request.intended_worker_id()),
39123912
send_reply_callback)) {

src/ray/core_worker/core_worker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,9 +1155,9 @@ class CoreWorker : public rpc::CoreWorkerServiceHandler {
11551155
rpc::SendReplyCallback send_reply_callback) override;
11561156

11571157
/// Implements gRPC server handler.
1158-
void HandleDirectActorCallArgWaitComplete(
1159-
rpc::DirectActorCallArgWaitCompleteRequest request,
1160-
rpc::DirectActorCallArgWaitCompleteReply *reply,
1158+
void HandleActorCallArgWaitComplete(
1159+
rpc::ActorCallArgWaitCompleteRequest request,
1160+
rpc::ActorCallArgWaitCompleteReply *reply,
11611161
rpc::SendReplyCallback send_reply_callback) override;
11621162

11631163
/// Implements gRPC server handler.

src/ray/core_worker/transport/actor_task_submitter.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
namespace ray {
4646
namespace core {
4747

48-
/// In direct actor call task submitter and receiver, a task is directly submitted
49-
/// to the actor that will execute it.
50-
5148
// Interface for testing.
5249
class ActorTaskSubmitterInterface {
5350
public:
@@ -436,7 +433,7 @@ class ActorTaskSubmitter : public ActorTaskSubmitterInterface {
436433

437434
absl::flat_hash_map<ActorID, ClientQueue> client_queues_ ABSL_GUARDED_BY(mu_);
438435

439-
/// Resolve direct call object dependencies.
436+
/// Resolve object dependencies.
440437
LocalDependencyResolver resolver_;
441438

442439
/// Used to complete tasks.

src/ray/core_worker/transport/scheduling_util.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void DependencyWaiterImpl::Wait(const std::vector<rpc::ObjectReference> &depende
6565
std::function<void()> on_dependencies_available) {
6666
auto tag = next_request_id_++;
6767
requests_[tag] = on_dependencies_available;
68-
RAY_CHECK_OK(dependency_client_.WaitForDirectActorCallArgs(dependencies, tag));
68+
RAY_CHECK_OK(dependency_client_.WaitForActorCallArgs(dependencies, tag));
6969
}
7070

7171
/// Fulfills the callback stored by Wait().

src/ray/gcs/gcs_server/test/gcs_server_test_util.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ struct GcsServerMocker {
322322
const ray::rpc::ClientCallback<ray::rpc::PinObjectIDsReply> &callback) override {}
323323

324324
/// DependencyWaiterInterface
325-
ray::Status WaitForDirectActorCallArgs(
326-
const std::vector<rpc::ObjectReference> &references, int64_t tag) override {
325+
ray::Status WaitForActorCallArgs(const std::vector<rpc::ObjectReference> &references,
326+
int64_t tag) override {
327327
return ray::Status::OK();
328328
}
329329

0 commit comments

Comments
 (0)