Skip to content

Add lock for pull_requests_ to avoid undefined behavior. #4

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

Closed
wants to merge 1 commit into from
Closed

Add lock for pull_requests_ to avoid undefined behavior. #4

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
22 changes: 15 additions & 7 deletions src/ray/object_manager/object_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,21 @@ ray::Status ObjectManager::Pull(const ObjectID &object_id) {
}

void ObjectManager::SchedulePull(const ObjectID &object_id, int wait_ms) {
pull_requests_[object_id] = std::make_shared<boost::asio::deadline_timer>(
*main_service_, boost::posix_time::milliseconds(wait_ms));
pull_requests_[object_id]->async_wait(
[this, object_id](const boost::system::error_code &error_code) {
pull_requests_.erase(object_id);
RAY_CHECK_OK(PullGetLocations(object_id));
});
auto timer = std::make_shared<boost::asio::deadline_timer>(
*main_service_, boost::posix_time::milliseconds(wait_ms));

{
std::lock_guard<std::mutex> lock(pull_requests_lock_);
pull_requests_[object_id] = timer;
}

timer->async_wait([this, object_id](const boost::system::error_code &error_code) {
{
std::lock_guard<std::mutex> lock(pull_requests_lock_);
pull_requests_.erase(object_id);
}
RAY_CHECK_OK(PullGetLocations(object_id));
});
}

ray::Status ObjectManager::PullGetLocations(const ObjectID &object_id) {
Expand Down
4 changes: 4 additions & 0 deletions src/ray/object_manager/object_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <map>
#include <memory>
#include <thread>
#include <mutex>

#include <boost/asio.hpp>
#include <boost/asio/error.hpp>
Expand Down Expand Up @@ -178,6 +179,9 @@ class ObjectManager {
/// Connection pool for reusing outgoing connections to remote object managers.
ConnectionPool connection_pool_;

/// Lock for pull_requests_
std::mutex pull_requests_lock_;

/// Timeout for failed pull requests.
std::unordered_map<ObjectID, std::shared_ptr<boost::asio::deadline_timer>>
pull_requests_;
Expand Down