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

[GCS] Use new interface class GcsClient in ray (#6805)

Browse Source
This commit is contained in:
micafan
2020-01-17 14:51:18 +08:00
committed by Zhijun Fu
parent 8e8b66a4b8
commit e143f85ca0
24 changed files with 91 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/core_worker/core_worker.h
+1 -1
View File
@@ -589,7 +589,7 @@ class CoreWorker : public rpc::CoreWorkerServiceHandler {
bool connected_ = false;
// Client to the GCS shared by core worker interfaces.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
// Client to the raylet shared by core worker interfaces. This needs to be a
// shared_ptr for direct calls because we can lease multiple workers through
src/ray/core_worker/profiling.cc
+1 -1
View File
@@ -15,7 +15,7 @@ ProfileEvent::ProfileEvent(const std::shared_ptr<Profiler> &profiler,
Profiler::Profiler(WorkerContext &worker_context, const std::string &node_ip_address,
boost::asio::io_service &io_service,
const std::shared_ptr<gcs::RedisGcsClient> &gcs_client)
const std::shared_ptr<gcs::GcsClient> &gcs_client)
: io_service_(io_service),
timer_(io_service_, boost::asio::chrono::seconds(1)),
rpc_profile_data_(new rpc::ProfileTableData()),
src/ray/core_worker/profiling.h
+2 -2
View File
@@ -15,7 +15,7 @@ class Profiler {
public:
Profiler(WorkerContext &worker_context, const std::string &node_ip_address,
boost::asio::io_service &io_service,
const std::shared_ptr<gcs::RedisGcsClient> &gcs_client);
const std::shared_ptr<gcs::GcsClient> &gcs_client);
// Add an event to the queue to be flushed periodically.
void AddEvent(const rpc::ProfileTableData::ProfileEvent &event) LOCKS_EXCLUDED(mutex_);
@@ -38,7 +38,7 @@ class Profiler {
std::shared_ptr<rpc::ProfileTableData> rpc_profile_data_ GUARDED_BY(mutex_);
// Client to the GCS used to push profile events to it.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
};
class ProfileEvent {
src/ray/gcs/gcs_client.h
+5 -2
View File
@@ -60,6 +60,9 @@ class GcsClient : public std::enable_shared_from_this<GcsClient> {
/// Disconnect with GCS Service. Non-thread safe.
virtual void Disconnect() = 0;
/// Return client information for debug.
virtual std::string DebugString() const { return ""; }
/// Get the sub-interface for accessing actor information in GCS.
/// This function is thread safe.
ActorInfoAccessor &Actors() {
@@ -102,14 +105,14 @@ class GcsClient : public std::enable_shared_from_this<GcsClient> {
return *error_accessor_;
}
/// Get the sub-interface for accessing stats in GCS.
/// Get the sub-interface for accessing stats information in GCS.
/// This function is thread safe.
StatsInfoAccessor &Stats() {
RAY_CHECK(stats_accessor_ != nullptr);
return *stats_accessor_;
}
/// Get the sub-interface for accessing stats in GCS.
/// Get the sub-interface for accessing worker information in GCS.
/// This function is thread safe.
WorkerInfoAccessor &Workers() {
RAY_CHECK(worker_accessor_ != nullptr);
src/ray/gcs/redis_gcs_client.h
+32 -51
View File
@@ -18,26 +18,6 @@ namespace gcs {
class RedisContext;
class RAY_EXPORT RedisGcsClient : public GcsClient {
// TODO(micafan) Will remove those friend classes after we replace RedisGcsClient
// with interface class GcsClient in raylet.
friend class RedisActorInfoAccessor;
friend class RedisJobInfoAccessor;
friend class RedisTaskInfoAccessor;
friend class RedisNodeInfoAccessor;
friend class RedisObjectInfoAccessor;
friend class RedisErrorInfoAccessor;
friend class RedisStatsInfoAccessor;
friend class RedisWorkerInfoAccessor;
friend class SubscriptionExecutorTest;
friend class LogSubscribeTestHelper;
friend class LogLookupTestHelper;
friend class LogDeleteTestHelper;
friend class TaskTableTestHelper;
friend class ClientTableTestHelper;
friend class SetTestHelper;
friend class HashTableTestHelper;
friend class ActorCheckpointIdTable;
public:
/// Constructor of RedisGcsClient.
/// Connect() must be called(and return ok) before you call any other methods.
@@ -61,10 +41,15 @@ class RAY_EXPORT RedisGcsClient : public GcsClient {
/// Must be single-threaded io_service (get more information from RedisAsioClient).
///
/// \return Status
Status Connect(boost::asio::io_service &io_service);
Status Connect(boost::asio::io_service &io_service) override;
/// Disconnect with GCS Service. Non-thread safe.
void Disconnect();
void Disconnect() override;
/// Returns debug string for class.
///
/// \return string.
std::string DebugString() const override;
// We also need something to export generic code to run on workers from the
// driver (to set the PYTHONPATH)
@@ -77,41 +62,37 @@ class RAY_EXPORT RedisGcsClient : public GcsClient {
std::vector<std::shared_ptr<RedisContext>> shard_contexts() { return shard_contexts_; }
std::shared_ptr<RedisContext> primary_context() { return primary_context_; }
/// Returns debug string for class.
///
/// \return string.
std::string DebugString() const;
/// The following xxx_table methods implement the Accessor interfaces.
/// Implements the Actors() interface.
ActorTable &actor_table();
ActorCheckpointTable &actor_checkpoint_table();
ActorCheckpointIdTable &actor_checkpoint_id_table();
/// Implements the Jobs() interface.
JobTable &job_table();
/// Implements the Objects() interface.
ObjectTable &object_table();
/// Implements the Nodes() interface.
ClientTable &client_table();
HeartbeatTable &heartbeat_table();
HeartbeatBatchTable &heartbeat_batch_table();
DynamicResourceTable &resource_table();
/// Implements the Tasks() interface.
raylet::TaskTable &raylet_task_table();
TaskLeaseTable &task_lease_table();
TaskReconstructionLog &task_reconstruction_log();
/// Implements the Errors() interface.
// TODO: Some API for getting the error on the driver
ErrorTable &error_table();
/// Implements the Stats() interface.
ProfileTable &profile_table();
/// Implements the Workers() interface.
WorkerFailureTable &worker_failure_table();
private:
/// Attach this client to an asio event loop. Note that only
/// one event loop should be attached at a time.
void Attach(boost::asio::io_service &io_service);
/// The following three methods will be deprecated, use method Actors() instead.
ActorTable &actor_table();
ActorCheckpointTable &actor_checkpoint_table();
ActorCheckpointIdTable &actor_checkpoint_id_table();
/// This method will be deprecated, use method Jobs() instead.
JobTable &job_table();
/// This method will be deprecated, use method Objects() instead.
ObjectTable &object_table();
/// The following four methods will be deprecated, use method Nodes() instead.
ClientTable &client_table();
HeartbeatTable &heartbeat_table();
HeartbeatBatchTable &heartbeat_batch_table();
DynamicResourceTable &resource_table();
/// The following three methods will be deprecated, use method Tasks() instead.
raylet::TaskTable &raylet_task_table();
TaskLeaseTable &task_lease_table();
TaskReconstructionLog &task_reconstruction_log();
/// This method will be deprecated, use method Errors() instead.
// TODO: Some API for getting the error on the driver
ErrorTable &error_table();
/// This method will be deprecated, use method Stats() instead.
ProfileTable &profile_table();
/// This method will be deprecated, use method Workers() instead.
WorkerFailureTable &worker_failure_table();
// GCS command type. If CommandType::kChain, chain-replicated versions of the tables
// might be used, if available.
CommandType command_type_{CommandType::kUnknown};
src/ray/object_manager/object_directory.cc
+2 -2
View File
@@ -3,7 +3,7 @@
namespace ray {
ObjectDirectory::ObjectDirectory(boost::asio::io_service &io_service,
std::shared_ptr<gcs::RedisGcsClient> &gcs_client)
std::shared_ptr<gcs::GcsClient> &gcs_client)
: io_service_(io_service), gcs_client_(gcs_client) {}
namespace {
@@ -17,7 +17,7 @@ using ray::rpc::ObjectTableData;
/// object table entries up to but not including this notification.
void UpdateObjectLocations(bool is_added,
const std::vector<ObjectTableData> &location_updates,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
std::unordered_set<ClientID> *node_ids) {
// location_updates contains the updates of locations of the object.
// with GcsChangeMode, we can determine whether the update mode is
src/ray/object_manager/object_directory.h
+2 -2
View File
@@ -129,7 +129,7 @@ class ObjectDirectory : public ObjectDirectoryInterface {
/// \param gcs_client A Ray GCS client to request object and client
/// information from.
ObjectDirectory(boost::asio::io_service &io_service,
std::shared_ptr<gcs::RedisGcsClient> &gcs_client);
std::shared_ptr<gcs::GcsClient> &gcs_client);
virtual ~ObjectDirectory() {}
@@ -178,7 +178,7 @@ class ObjectDirectory : public ObjectDirectoryInterface {
/// Reference to the event loop.
boost::asio::io_service &io_service_;
/// Reference to the gcs client.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// Info about subscribers to object locations.
std::unordered_map<ObjectID, LocationListenerState> listeners_;
};
src/ray/object_manager/test/object_manager_stress_test.cc
+6 -8
View File
@@ -34,7 +34,7 @@ class MockServer {
public:
MockServer(boost::asio::io_service &main_service,
const ObjectManagerConfig &object_manager_config,
std::shared_ptr<gcs::RedisGcsClient> gcs_client)
std::shared_ptr<gcs::GcsClient> gcs_client)
: node_id_(ClientID::FromRandom()),
config_(object_manager_config),
gcs_client_(gcs_client),
@@ -62,7 +62,7 @@ class MockServer {
ClientID node_id_;
ObjectManagerConfig config_;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
ObjectManager object_manager_;
};
@@ -106,8 +106,7 @@ class TestObjectManagerBase : public ::testing::Test {
// start first server
gcs::GcsClientOptions client_options("127.0.0.1", 6379, /*password*/ "",
/*is_test_client=*/true);
gcs_client_1 =
std::shared_ptr<gcs::RedisGcsClient>(new gcs::RedisGcsClient(client_options));
gcs_client_1 = std::make_shared<gcs::RedisGcsClient>(client_options);
RAY_CHECK_OK(gcs_client_1->Connect(main_service));
ObjectManagerConfig om_config_1;
om_config_1.store_socket_name = store_id_1;
@@ -119,8 +118,7 @@ class TestObjectManagerBase : public ::testing::Test {
server1.reset(new MockServer(main_service, om_config_1, gcs_client_1));
// start second server
gcs_client_2 =
std::shared_ptr<gcs::RedisGcsClient>(new gcs::RedisGcsClient(client_options));
gcs_client_2 = std::make_shared<gcs::RedisGcsClient>(client_options);
RAY_CHECK_OK(gcs_client_2->Connect(main_service));
ObjectManagerConfig om_config_2;
om_config_2.store_socket_name = store_id_2;
@@ -170,8 +168,8 @@ class TestObjectManagerBase : public ::testing::Test {
protected:
std::thread p;
boost::asio::io_service main_service;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_1;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_2;
std::shared_ptr<gcs::GcsClient> gcs_client_1;
std::shared_ptr<gcs::GcsClient> gcs_client_2;
std::unique_ptr<MockServer> server1;
std::unique_ptr<MockServer> server2;
src/ray/object_manager/test/object_manager_test.cc
+6 -8
View File
@@ -28,7 +28,7 @@ class MockServer {
public:
MockServer(boost::asio::io_service &main_service,
const ObjectManagerConfig &object_manager_config,
std::shared_ptr<gcs::RedisGcsClient> gcs_client)
std::shared_ptr<gcs::GcsClient> gcs_client)
: node_id_(ClientID::FromRandom()),
config_(object_manager_config),
gcs_client_(gcs_client),
@@ -56,7 +56,7 @@ class MockServer {
ClientID node_id_;
ObjectManagerConfig config_;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
ObjectManager object_manager_;
};
@@ -98,8 +98,7 @@ class TestObjectManagerBase : public ::testing::Test {
// start first server
gcs::GcsClientOptions client_options("127.0.0.1", 6379, /*password*/ "",
/*is_test_client=*/true);
gcs_client_1 =
std::shared_ptr<gcs::RedisGcsClient>(new gcs::RedisGcsClient(client_options));
gcs_client_1 = std::make_shared<gcs::RedisGcsClient>(client_options);
RAY_CHECK_OK(gcs_client_1->Connect(main_service));
ObjectManagerConfig om_config_1;
om_config_1.store_socket_name = store_id_1;
@@ -111,8 +110,7 @@ class TestObjectManagerBase : public ::testing::Test {
server1.reset(new MockServer(main_service, om_config_1, gcs_client_1));
// start second server
gcs_client_2 =
std::shared_ptr<gcs::RedisGcsClient>(new gcs::RedisGcsClient(client_options));
gcs_client_2 = std::make_shared<gcs::RedisGcsClient>(client_options);
RAY_CHECK_OK(gcs_client_2->Connect(main_service));
ObjectManagerConfig om_config_2;
om_config_2.store_socket_name = store_id_2;
@@ -166,8 +164,8 @@ class TestObjectManagerBase : public ::testing::Test {
protected:
std::thread p;
boost::asio::io_service main_service;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_1;
std::shared_ptr<gcs::RedisGcsClient> gcs_client_2;
std::shared_ptr<gcs::GcsClient> gcs_client_1;
std::shared_ptr<gcs::GcsClient> gcs_client_2;
std::unique_ptr<MockServer> server1;
std::unique_ptr<MockServer> server2;
src/ray/raylet/lineage_cache.cc
+1 -1
View File
@@ -153,7 +153,7 @@ const std::unordered_set<TaskID> &Lineage::GetChildren(const TaskID &task_id) co
}
LineageCache::LineageCache(const ClientID &self_node_id,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
uint64_t max_lineage_size)
: self_node_id_(self_node_id), gcs_client_(gcs_client) {}
src/ray/raylet/lineage_cache.h
+2 -3
View File
@@ -209,8 +209,7 @@ class LineageCache {
public:
/// Create a lineage cache for the given task storage system.
/// TODO(swang): Pass in the policy (interface?).
LineageCache(const ClientID &self_node_id,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
LineageCache(const ClientID &self_node_id, std::shared_ptr<gcs::GcsClient> gcs_client,
uint64_t max_lineage_size);
/// Asynchronously commit a task to the GCS.
@@ -306,7 +305,7 @@ class LineageCache {
/// ID of this node.
ClientID self_node_id_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// All tasks and objects that we are responsible for writing back to the
/// GCS, and the tasks and objects in their lineage.
Lineage lineage_;
src/ray/raylet/monitor.cc
+9 -9
View File
@@ -16,12 +16,12 @@ namespace raylet {
/// within heartbeat_timeout_milliseconds * num_heartbeats_timeout (defined in
/// the Ray configuration), then the monitor will mark that Raylet as dead in
/// the client table, which broadcasts the event to all other Raylets.
Monitor::Monitor(boost::asio::io_service &io_service, const std::string &redis_address,
int redis_port, const std::string &redis_password)
: gcs_client_(gcs::GcsClientOptions(redis_address, redis_port, redis_password)),
Monitor::Monitor(boost::asio::io_service &io_service,
const gcs::GcsClientOptions &gcs_client_options)
: gcs_client_(new gcs::RedisGcsClient(gcs_client_options)),
num_heartbeats_timeout_(RayConfig::instance().num_heartbeats_timeout()),
heartbeat_timer_(io_service) {
RAY_CHECK_OK(gcs_client_.Connect(io_service));
RAY_CHECK_OK(gcs_client_->Connect(io_service));
}
void Monitor::HandleHeartbeat(const ClientID &node_id,
@@ -35,7 +35,7 @@ void Monitor::Start() {
const HeartbeatTableData &heartbeat_data) {
HandleHeartbeat(id, heartbeat_data);
};
RAY_CHECK_OK(gcs_client_.Nodes().AsyncSubscribeHeartbeat(heartbeat_callback, nullptr));
RAY_CHECK_OK(gcs_client_->Nodes().AsyncSubscribeHeartbeat(heartbeat_callback, nullptr));
Tick();
}
@@ -59,7 +59,7 @@ void Monitor::Tick() {
}
if (!marked) {
RAY_CHECK_OK(
gcs_client_.Nodes().AsyncUnregister(node_id, /* callback */ nullptr));
gcs_client_->Nodes().AsyncUnregister(node_id, /* callback */ nullptr));
// Broadcast a warning to all of the drivers indicating that the node
// has been marked as dead.
// TODO(rkn): Define this constant somewhere else.
@@ -71,10 +71,10 @@ void Monitor::Tick() {
auto error_data_ptr =
gcs::CreateErrorTableData(type, error_message.str(), current_time_ms());
RAY_CHECK_OK(
gcs_client_.Errors().AsyncReportJobError(error_data_ptr, nullptr));
gcs_client_->Errors().AsyncReportJobError(error_data_ptr, nullptr));
}
};
RAY_CHECK_OK(gcs_client_.Nodes().AsyncGetAll(lookup_callback));
RAY_CHECK_OK(gcs_client_->Nodes().AsyncGetAll(lookup_callback));
dead_nodes_.insert(node_id);
}
it = heartbeats_.erase(it);
@@ -89,7 +89,7 @@ void Monitor::Tick() {
for (const auto &heartbeat : heartbeat_buffer_) {
batch->add_batch()->CopyFrom(heartbeat.second);
}
RAY_CHECK_OK(gcs_client_.Nodes().AsyncReportBatchHeartbeat(batch, nullptr));
RAY_CHECK_OK(gcs_client_->Nodes().AsyncReportBatchHeartbeat(batch, nullptr));
heartbeat_buffer_.clear();
}
src/ray/raylet/monitor.h
+3 -3
View File
@@ -22,8 +22,8 @@ class Monitor {
/// \param io_service The event loop to run the monitor on.
/// \param redis_address The GCS Redis address to connect to.
/// \param redis_port The GCS Redis port to connect to.
Monitor(boost::asio::io_service &io_service, const std::string &redis_address,
int redis_port, const std::string &redis_password);
Monitor(boost::asio::io_service &io_service,
const gcs::GcsClientOptions &gcs_client_options);
/// Start the monitor. Listen for heartbeats from Raylets and mark Raylets
/// that do not send a heartbeat within a given period as dead.
@@ -43,7 +43,7 @@ class Monitor {
private:
/// A client to the GCS, through which heartbeats are received.
gcs::RedisGcsClient gcs_client_;
std::unique_ptr<gcs::GcsClient> gcs_client_;
/// The number of heartbeats that can be missed before a client is removed.
int64_t num_heartbeats_timeout_;
/// A timer that ticks every heartbeat_timeout_ms_ milliseconds.
src/ray/raylet/monitor_main.cc
+4 -1
View File
@@ -24,6 +24,9 @@ int main(int argc, char *argv[]) {
const std::string redis_password = FLAGS_redis_password;
gflags::ShutDownCommandLineFlags();
ray::gcs::GcsClientOptions gcs_client_options(redis_address, redis_port,
redis_password);
std::unordered_map<std::string, std::string> raylet_config;
// Parse the configuration list.
@@ -52,7 +55,7 @@ int main(int argc, char *argv[]) {
// signals.async_wait(handler);
// Initialize the monitor.
ray::raylet::Monitor monitor(io_service, redis_address, redis_port, redis_password);
ray::raylet::Monitor monitor(io_service, gcs_client_options);
monitor.Start();
io_service.run();
}
src/ray/raylet/node_manager.cc
+1 -1
View File
@@ -73,7 +73,7 @@ namespace raylet {
NodeManager::NodeManager(boost::asio::io_service &io_service,
const ClientID &self_node_id, const NodeManagerConfig &config,
ObjectManager &object_manager,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
std::shared_ptr<ObjectDirectoryInterface> object_directory)
: self_node_id_(self_node_id),
io_service_(io_service),
src/ray/raylet/node_manager.h
+2 -2
View File
@@ -77,7 +77,7 @@ class NodeManager : public rpc::NodeManagerServiceHandler {
/// \param object_manager A reference to the local object manager.
NodeManager(boost::asio::io_service &io_service, const ClientID &self_node_id,
const NodeManagerConfig &config, ObjectManager &object_manager,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
std::shared_ptr<ObjectDirectoryInterface> object_directory_);
/// Process a new client connection.
@@ -587,7 +587,7 @@ class NodeManager : public rpc::NodeManagerServiceHandler {
/// actor died) and to pin objects that are in scope in the cluster.
plasma::PlasmaClient store_client_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// The object table. This is shared with the object manager.
std::shared_ptr<ObjectDirectoryInterface> object_directory_;
/// The timer used to send heartbeats.
src/ray/raylet/raylet.cc
+1 -1
View File
@@ -44,7 +44,7 @@ Raylet::Raylet(boost::asio::io_service &main_service, const std::string &socket_
int redis_port, const std::string &redis_password,
const NodeManagerConfig &node_manager_config,
const ObjectManagerConfig &object_manager_config,
std::shared_ptr<gcs::RedisGcsClient> gcs_client)
std::shared_ptr<gcs::GcsClient> gcs_client)
: self_node_id_(ClientID::FromRandom()),
gcs_client_(gcs_client),
object_directory_(std::make_shared<ObjectDirectory>(main_service, gcs_client_)),
src/ray/raylet/raylet.h
+2 -2
View File
@@ -41,7 +41,7 @@ class Raylet {
int redis_port, const std::string &redis_password,
const NodeManagerConfig &node_manager_config,
const ObjectManagerConfig &object_manager_config,
std::shared_ptr<gcs::RedisGcsClient> gcs_client);
std::shared_ptr<gcs::GcsClient> gcs_client);
/// Start this raylet.
void Start();
@@ -69,7 +69,7 @@ class Raylet {
GcsNodeInfo self_node_info_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// The object table. This is shared between the object manager and node
/// manager.
std::shared_ptr<ObjectDirectoryInterface> object_directory_;
src/ray/raylet/reconstruction_policy.cc
+1 -1
View File
@@ -10,7 +10,7 @@ ReconstructionPolicy::ReconstructionPolicy(
boost::asio::io_service &io_service,
std::function<void(const TaskID &, const ObjectID &)> reconstruction_handler,
int64_t initial_reconstruction_timeout_ms, const ClientID &client_id,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
std::shared_ptr<ObjectDirectoryInterface> object_directory)
: io_service_(io_service),
reconstruction_handler_(reconstruction_handler),
src/ray/raylet/reconstruction_policy.h
+2 -2
View File
@@ -43,7 +43,7 @@ class ReconstructionPolicy : public ReconstructionPolicyInterface {
boost::asio::io_service &io_service,
std::function<void(const TaskID &, const ObjectID &)> reconstruction_handler,
int64_t initial_reconstruction_timeout_ms, const ClientID &client_id,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
std::shared_ptr<ObjectDirectoryInterface> object_directory);
/// Listen for task lease notifications about an object that may require
@@ -142,7 +142,7 @@ class ReconstructionPolicy : public ReconstructionPolicyInterface {
/// The client ID to use when requesting notifications from the GCS.
const ClientID client_id_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// The object directory used to lookup object locations.
std::shared_ptr<ObjectDirectoryInterface> object_directory_;
/// The tasks that we are currently subscribed to in the GCS.
src/ray/raylet/task_dependency_manager.cc
+1 -1
View File
@@ -12,7 +12,7 @@ TaskDependencyManager::TaskDependencyManager(
ObjectManagerInterface &object_manager,
ReconstructionPolicyInterface &reconstruction_policy,
boost::asio::io_service &io_service, const ClientID &client_id,
int64_t initial_lease_period_ms, std::shared_ptr<gcs::RedisGcsClient> gcs_client)
int64_t initial_lease_period_ms, std::shared_ptr<gcs::GcsClient> gcs_client)
: object_manager_(object_manager),
reconstruction_policy_(reconstruction_policy),
io_service_(io_service),
src/ray/raylet/task_dependency_manager.h
+2 -2
View File
@@ -34,7 +34,7 @@ class TaskDependencyManager {
ReconstructionPolicyInterface &reconstruction_policy,
boost::asio::io_service &io_service, const ClientID &client_id,
int64_t initial_lease_period_ms,
std::shared_ptr<gcs::RedisGcsClient> gcs_client);
std::shared_ptr<gcs::GcsClient> gcs_client);
/// Check whether an object is locally available.
///
@@ -228,7 +228,7 @@ class TaskDependencyManager {
/// lease is renewed.
const int64_t initial_lease_period_ms_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
/// A mapping from task ID of each subscribed task to its list of object
/// dependencies, either task arguments or objects passed into `ray.get`.
std::unordered_map<ray::TaskID, TaskDependencies> task_dependencies_;
src/ray/raylet/worker_pool.cc
+1 -1
View File
@@ -48,7 +48,7 @@ namespace raylet {
/// each language.
WorkerPool::WorkerPool(boost::asio::io_service &io_service, int num_workers,
int maximum_startup_concurrency,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
std::shared_ptr<gcs::GcsClient> gcs_client,
const WorkerCommandMap &worker_commands)
: io_service_(&io_service),
maximum_startup_concurrency_(maximum_startup_concurrency),
src/ray/raylet/worker_pool.h
+2 -3
View File
@@ -44,8 +44,7 @@ class WorkerPool {
/// \param worker_commands The commands used to start the worker process, grouped by
/// language.
WorkerPool(boost::asio::io_service &io_service, int num_workers,
int maximum_startup_concurrency,
std::shared_ptr<gcs::RedisGcsClient> gcs_client,
int maximum_startup_concurrency, std::shared_ptr<gcs::GcsClient> gcs_client,
const WorkerCommandMap &worker_commands);
/// Destructor responsible for freeing a set of workers owned by this class.
@@ -228,7 +227,7 @@ class WorkerPool {
/// The maximum number of worker processes that can be started concurrently.
int maximum_startup_concurrency_;
/// A client connection to the GCS.
std::shared_ptr<gcs::RedisGcsClient> gcs_client_;
std::shared_ptr<gcs::GcsClient> gcs_client_;
FRIEND_TEST(WorkerPoolTest, InitialWorkerProcessCount);
};