Skip to content

[core] (ray-get 3/n) Making concurrent ray.get requests for the same object from the same worker thread-safe. #58606

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
edoakes merged 3 commits into from
Nov 14, 2025
Merged

[core] (ray-get 3/n) Making concurrent ray.get requests for the same object from the same worker thread-safe. #58606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef5108
[core] (ray-get 3/n) Making concurrent ray.get requests for the same
israbbani Nov 13, 2025
8eadf3d
fixing comment
israbbani Nov 14, 2025
c4beca7
Merge branch 'master' into irabbani/ray-get-3
israbbani Nov 14, 2025
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
12 changes: 9 additions & 3 deletions src/ray/raylet/lease_dependency_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void LeaseDependencyManager::StartGetRequest(
const auto obj_id = ObjectRefToId(ref);
object_ids.emplace_back(obj_id);
auto it = GetOrInsertRequiredObject(obj_id, ref);
it->second.dependent_get_requests.insert(worker_id);
++it->second.dependent_get_requests[worker_id];
}

uint64_t new_pull_request_id = object_manager_.Pull(
Expand Down Expand Up @@ -158,7 +158,10 @@ void LeaseDependencyManager::CancelGetRequest(const WorkerID &worker_id,
for (const auto &obj_id : object_ids) {
auto obj_iter = required_objects_.find(obj_id);
RAY_CHECK(obj_iter != required_objects_.end());
obj_iter->second.dependent_get_requests.erase(worker_id);
--obj_iter->second.dependent_get_requests[worker_id];
if (obj_iter->second.dependent_get_requests[worker_id] == 0) {
obj_iter->second.dependent_get_requests.erase(worker_id);
}
RemoveObjectIfNotNeeded(obj_iter);
}

Expand Down Expand Up @@ -193,7 +196,10 @@ void LeaseDependencyManager::CancelGetRequest(const WorkerID &worker_id) {
for (const auto &obj_id : object_ids) {
auto obj_iter = required_objects_.find(obj_id);
RAY_CHECK(obj_iter != required_objects_.end());
obj_iter->second.dependent_get_requests.erase(worker_id);
--obj_iter->second.dependent_get_requests[worker_id];
if (obj_iter->second.dependent_get_requests[worker_id] == 0) {
obj_iter->second.dependent_get_requests.erase(worker_id);
}
RemoveObjectIfNotNeeded(obj_iter);
}

Expand Down
5 changes: 3 additions & 2 deletions src/ray/raylet/lease_dependency_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
Expand Down Expand Up @@ -218,8 +219,8 @@ class LeaseDependencyManager : public LeaseDependencyManagerInterface {
/// argument or because the lease of the lease called `ray.get` on the object.
std::unordered_set<LeaseID> dependent_leases;
/// The workers that depend on this object because they called `ray.get` on the
/// object.
std::unordered_set<WorkerID> dependent_get_requests;
/// object and the count of outstanding get_requests per worker.
std::unordered_map<WorkerID, int64_t> dependent_get_requests;
Copy link
Contributor Author

@israbbani israbbani Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this map is redundant with all of the other bookkeeping inside LeaseDependencyManager. I'm debating refactoring the entire class .

Copy link
Collaborator

@edoakes edoakes Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true. do it!

/// The workers that depend on this object because they called `ray.wait` on the
/// object.
std::unordered_set<WorkerID> dependent_wait_requests;
Expand Down
17 changes: 17 additions & 0 deletions src/ray/raylet/tests/lease_dependency_manager_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,23 @@ TEST_F(LeaseDependencyManagerTest, TestCancelingSingleGetRequestForWorker) {
AssertNoLeaks();
}

TEST_F(LeaseDependencyManagerTest,
TestCancelingMultipleGetRequestsForSameObjectForWorker) {
WorkerID worker_id = WorkerID::FromRandom();
ObjectID argument_id = ObjectID::FromRandom();
int num_requests = 5;
for (int64_t i = 0; i < num_requests; i++) {
lease_dependency_manager_.StartGetRequest(
worker_id, ObjectIdsToRefs({argument_id}), i);
}
ASSERT_EQ(object_manager_mock_.active_get_requests.size(), num_requests);
for (int64_t i = 0; i < num_requests; i++) {
lease_dependency_manager_.CancelGetRequest(worker_id, i);
ASSERT_EQ(object_manager_mock_.active_get_requests.size(), num_requests - (i + 1));
}
AssertNoLeaks();
}

TEST_F(LeaseDependencyManagerTest, TestCancelingAllGetRequestsForWorker) {
WorkerID worker_id = WorkerID::FromRandom();
int num_requests = 5;
Expand Down