Skip to content

Initialize client_id_ in ObjectManager constructor #3403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2018
Merged

Initialize client_id_ in ObjectManager constructor #3403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ray/object_manager/object_directory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ ray::Status ObjectDirectory::LookupLocations(const ObjectID &object_id,
return status;
}

ray::ClientID ObjectDirectory::GetLocalClientID() {
return gcs_client_->client_table().GetLocalClientId();
}

std::string ObjectDirectory::DebugString() const {
std::stringstream result;
result << "ObjectDirectory:";
Expand Down
7 changes: 7 additions & 0 deletions src/ray/object_manager/object_directory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ class ObjectDirectoryInterface {
virtual ray::Status ReportObjectRemoved(const ObjectID &object_id,
const ClientID &client_id) = 0;

/// Get local client id
///
/// \return ClientID
virtual ray::ClientID GetLocalClientID() = 0;

/// Returns debug string for class.
///
/// \return string.
Expand Down Expand Up @@ -145,6 +150,8 @@ class ObjectDirectory : public ObjectDirectoryInterface {
ray::Status ReportObjectRemoved(const ObjectID &object_id,
const ClientID &client_id) override;

ray::ClientID GetLocalClientID() override;

std::string DebugString() const override;

/// ObjectDirectory should not be copied.
Expand Down
2 changes: 1 addition & 1 deletion src/ray/object_manager/object_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ObjectManager::ObjectManager(asio::io_service &main_service,
gen_(std::chrono::high_resolution_clock::now().time_since_epoch().count()) {
RAY_CHECK(config_.max_sends > 0);
RAY_CHECK(config_.max_receives > 0);
// TODO(hme) Client ID is never set with this constructor.
client_id_ = object_directory_->GetLocalClientID();
main_service_ = &main_service;
store_notification_.SubscribeObjAdded(
[this](const object_manager::protocol::ObjectInfoT &object_info) {
Expand Down
1 change: 1 addition & 0 deletions src/ray/raylet/reconstruction_policy_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class MockObjectDirectory : public ObjectDirectoryInterface {
std::string DebugString() const { return ""; }

MOCK_METHOD0(RegisterBackend, void(void));
MOCK_METHOD0(GetLocalClientID, ray::ClientID());
MOCK_CONST_METHOD1(LookupRemoteConnectionInfo, void(RemoteConnectionInfo &));
MOCK_CONST_METHOD0(LookupAllRemoteConnections, std::vector<RemoteConnectionInfo>());
MOCK_METHOD3(SubscribeObjectLocations,
Expand Down