wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-09-09 11:32:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix hang if actor object id is returned from a task that exits (#6885)

Browse Source
This commit is contained in:
Eric Liang
2020-02-11 20:28:13 -08:00
committed by GitHub
parent e09f63ad65
commit 305eaaabe9
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/core_worker/core_worker.cc
+4 -3
View File
@@ -288,13 +288,14 @@ void CoreWorker::SetCurrentTaskId(const TaskID &task_id) {
absl::MutexLock lock(&mutex_);
not_actor_task = actor_id_.IsNil();
}
// Clear all actor handles at the end of each non-actor task.
if (not_actor_task && task_id.IsNil()) {
absl::MutexLock lock(&actor_handles_mutex_);
// Reset the seqnos so that for the next task it start off at 0.
for (const auto &handle : actor_handles_) {
RAY_CHECK_OK(gcs_client_->Actors().AsyncUnsubscribe(handle.first, nullptr));
handle.second->Reset();
}
actor_handles_.clear();
// TODO(ekl) we can't unsubscribe to actor notifications here due to
// https://github.com/ray-project/ray/pull/6885
}
}