save

Signed-off-by: hejialing.hjl <hejialing.hjl@bytedance.com>

Author: hejialing.hjl

src/ray/raylet/dependency_manager.cc

@@ -146,10 +146,11 @@ void DependencyManager::StartOrUpdateGetRequest(
       object_manager_.CancelPull(*request_id);
     }
 
-    if (*request_id != new_request_id) {
-      get_requests_[worker_id][new_request_id] = get_request;
-      get_requests_[worker_id].erase(*request_id);
-    }
+    // new_request_id and *request_id should not be equal. We leave a RAY_CHECK here to
+    // prevent subsequent modifications from making them equal.
+    RAY_CHECK(*request_id != new_request_id);
+    get_requests_[worker_id][new_request_id] = get_request;
+    get_requests_[worker_id].erase(*request_id);
 
     *request_id = new_request_id;
     RAY_LOG(DEBUG) << "Started pull for get request from worker " << worker_id

src/ray/raylet/dependency_manager.h

@@ -301,10 +301,10 @@ class DependencyManager : public TaskDependencyManagerInterface {
   /// dependencies are all local or not.
   absl::flat_hash_map<TaskID, std::unique_ptr<TaskDependencies>> queued_task_requests_;
 
-  /// A map from worker ID to the set of objects that the worker called
-  /// `ray.get` on and a pull request ID for these objects. The pull request ID
-  /// should be used to cancel the pull request in the object manager once the
-  /// worker cancels the `ray.get` request.
+  /// A map from worker ID to the multiple sets of objects that the worker multiple called
+  /// ray.get on, and the corresponding pull request ID for each set. The pull request ID
+  /// should be used to cancel the pull request in the object manager once the worker
+  /// cancels the `ray.get` request.
   absl::flat_hash_map<WorkerID,
                       absl::flat_hash_map<uint64_t, absl::flat_hash_set<ObjectID>>>
       get_requests_;