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

Fix missing overrides (#6703)

Browse Source
This commit is contained in:
mehrdadn
2020-01-05 17:00:23 -08:00
committed by Philipp Moritz
parent e15bd8ff1a
commit 2228079481
5 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/rpc/gcs_server/gcs_rpc_client.h
+19 -19
View File
@@ -34,79 +34,79 @@ class GcsRpcClient {
/// Add job info to gcs server.
VOID_RPC_CLIENT_METHOD(JobInfoGcsService, AddJob, request, callback,
job_info_grpc_client_)
job_info_grpc_client_, )
/// Mark job as finished to gcs server.
VOID_RPC_CLIENT_METHOD(JobInfoGcsService, MarkJobFinished, request, callback,
job_info_grpc_client_)
job_info_grpc_client_, )
/// Get actor data from GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorInfo, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Register an actor to GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, RegisterActorInfo, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Update actor info in GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, UpdateActorInfo, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Add actor checkpoint data to GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, AddActorCheckpoint, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Get actor checkpoint data from GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpoint, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Get actor checkpoint id data from GCS Service.
VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpointID, request, callback,
actor_info_grpc_client_)
actor_info_grpc_client_, )
/// Register a node to GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, RegisterNode, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Unregister a node from GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UnregisterNode, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Get information of all nodes from GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetAllNodeInfo, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Report heartbeat of a node to GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportHeartbeat, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Report batch heartbeat to GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportBatchHeartbeat, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Get node's resources from GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetResources, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Update resources of a node in GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UpdateResources, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Delete resources of a node in GCS Service.
VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, DeleteResources, request, callback,
node_info_grpc_client_)
node_info_grpc_client_, )
/// Get object's locations from GCS Service.
VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, GetObjectLocations, request, callback,
object_info_grpc_client_)
object_info_grpc_client_, )
/// Add location of object to GCS Service.
VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, AddObjectLocation, request, callback,
object_info_grpc_client_)
object_info_grpc_client_, )
/// Remove location of object to GCS Service.
VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, RemoveObjectLocation, request, callback,
object_info_grpc_client_)
object_info_grpc_client_, )
private:
/// The gRPC-generated stub.
src/ray/rpc/grpc_client.h
+8 -8
View File
@@ -20,17 +20,17 @@ namespace rpc {
})
// Define a void RPC client method.
#define VOID_RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client) \
void METHOD(const METHOD##Request &request, \
const ClientCallback<METHOD##Reply> &callback) { \
RAY_UNUSED(INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client)); \
#define VOID_RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client, SPECS) \
void METHOD(const METHOD##Request &request, \
const ClientCallback<METHOD##Reply> &callback) SPECS { \
RAY_UNUSED(INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client)); \
}
// Define a RPC client method that returns ray::Status.
#define RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client) \
ray::Status METHOD(const METHOD##Request &request, \
const ClientCallback<METHOD##Reply> &callback) { \
return INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client); \
#define RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client, SPECS) \
ray::Status METHOD(const METHOD##Request &request, \
const ClientCallback<METHOD##Reply> &callback) SPECS { \
return INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client); \
}
template <class GrpcService>
src/ray/rpc/node_manager/node_manager_client.h
+5 -4
View File
@@ -33,11 +33,12 @@ class NodeManagerClient {
///
/// \param[in] request The request message.
/// \param[in] callback The callback function that handles reply.
VOID_RPC_CLIENT_METHOD(NodeManagerService, ForwardTask, request, callback, grpc_client_)
VOID_RPC_CLIENT_METHOD(NodeManagerService, ForwardTask, request, callback,
grpc_client_, )
/// Get current node stats.
VOID_RPC_CLIENT_METHOD(NodeManagerService, GetNodeStats, request, callback,
grpc_client_)
grpc_client_, )
void GetNodeStats(const ClientCallback<GetNodeStatsReply> &callback) {
GetNodeStatsRequest request;
@@ -70,10 +71,10 @@ class NodeManagerWorkerClient
/// Request a worker lease.
RPC_CLIENT_METHOD(NodeManagerService, RequestWorkerLease, request, callback,
grpc_client_)
grpc_client_, )
/// Return a worker lease.
RPC_CLIENT_METHOD(NodeManagerService, ReturnWorker, request, callback, grpc_client_)
RPC_CLIENT_METHOD(NodeManagerService, ReturnWorker, request, callback, grpc_client_, )
private:
/// Constructor.
src/ray/rpc/object_manager/object_manager_client.h
+3 -3
View File
@@ -42,21 +42,21 @@ class ObjectManagerClient {
/// \param request The request message.
/// \param callback The callback function that handles reply from server
VOID_RPC_CLIENT_METHOD(ObjectManagerService, Push, request, callback,
grpc_clients_[push_rr_index_++ % num_connections_])
grpc_clients_[push_rr_index_++ % num_connections_], )
/// Pull object from remote object manager
///
/// \param request The request message
/// \param callback The callback function that handles reply from server
VOID_RPC_CLIENT_METHOD(ObjectManagerService, Pull, request, callback,
grpc_clients_[pull_rr_index_++ % num_connections_])
grpc_clients_[pull_rr_index_++ % num_connections_], )
/// Tell remote object manager to free objects
///
/// \param request The request message
/// \param callback The callback function that handles reply
VOID_RPC_CLIENT_METHOD(ObjectManagerService, FreeObjects, request, callback,
grpc_clients_[freeobjects_rr_index_++ % num_connections_])
grpc_clients_[freeobjects_rr_index_++ % num_connections_], )
private:
/// To optimize object manager performance we create multiple concurrent
src/ray/rpc/worker/core_worker_client.h
+8 -5
View File
@@ -152,17 +152,20 @@ class CoreWorkerClient : public std::enable_shared_from_this<CoreWorkerClient>,
new GrpcClient<CoreWorkerService>(address, port, client_call_manager));
};
RPC_CLIENT_METHOD(CoreWorkerService, AssignTask, request, callback, grpc_client_)
RPC_CLIENT_METHOD(CoreWorkerService, AssignTask, request, callback, grpc_client_,
override)
RPC_CLIENT_METHOD(CoreWorkerService, DirectActorCallArgWaitComplete, request, callback,
grpc_client_)
grpc_client_, override)
RPC_CLIENT_METHOD(CoreWorkerService, GetObjectStatus, request, callback, grpc_client_)
RPC_CLIENT_METHOD(CoreWorkerService, GetObjectStatus, request, callback, grpc_client_,
override)
RPC_CLIENT_METHOD(CoreWorkerService, KillActor, request, callback, grpc_client_)
RPC_CLIENT_METHOD(CoreWorkerService, KillActor, request, callback, grpc_client_,
override)
RPC_CLIENT_METHOD(CoreWorkerService, GetCoreWorkerStats, request, callback,
grpc_client_)
grpc_client_, override)
ray::Status PushActorTask(std::unique_ptr<PushTaskRequest> request,
const ClientCallback<PushTaskReply> &callback) override {