Skip to content
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.

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

[Core] New scheduler fixes #9186

Merged
merged 23 commits into from
Jul 9, 2020
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
test_basic.py::test_many_fractional_resources causes ray to hang
wuisawesome committed Jun 24, 2020
commit 4d2417b4cb011000333588a477d10ff816a73e73
3 changes: 2 additions & 1 deletion src/ray/core_worker/transport/direct_task_transport.cc
Original file line number Diff line number Diff line change
@@ -153,7 +153,8 @@ void CoreWorkerDirectTaskSubmitter::CancelWorkerLeaseIfNeeded(
// longer need to cancel.
RAY_LOG(INFO) << "[CancelWorkerLeaseIfNeeded] Retrying cancel worker lease";
RAY_LOG(WARNING) << "Cancelling worker lease failed.";
CancelWorkerLeaseIfNeeded(scheduling_key);K
CancelWorkerLeaseIfNeeded(scheduling_key);
K
}
}));
}
5 changes: 2 additions & 3 deletions src/ray/raylet/node_manager.cc
Original file line number Diff line number Diff line change
@@ -1896,7 +1896,7 @@ void NodeManager::HandleCancelWorkerLease(const rpc::CancelWorkerLeaseRequest &r
bool canceled = false;

if (new_scheduler_enabled_) {
for (auto it = tasks_to_schedule_.begin(); it!=tasks_to_schedule_.end(); ++it) {
for (auto it = tasks_to_schedule_.begin(); it != tasks_to_schedule_.end(); ++it) {
auto cur_task_id = it->second.GetTaskSpecification().TaskId();
if (cur_task_id == task_id) {
tasks_to_schedule_.erase(it);
@@ -1908,8 +1908,7 @@ void NodeManager::HandleCancelWorkerLease(const rpc::CancelWorkerLeaseRequest &r
} else {
Task removed_task;
TaskState removed_task_state;
canceled =
local_queues_.RemoveTask(task_id, &removed_task, &removed_task_state);
canceled = local_queues_.RemoveTask(task_id, &removed_task, &removed_task_state);
if (!canceled) {
// We do not have the task. This could be because we haven't received the
// lease request yet, or because we already granted the lease request and