[core] Assign tasks to the first available worker #18167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
We should merge #18166 first. |
|
Probably need to update the C++ tests. |
ericl
approved these changes
Aug 31, 2021
src/ray/raylet/worker_pool.h
Outdated
| @@ -41,6 +41,9 @@ namespace raylet { | |||
| using WorkerCommandMap = | |||
| std::unordered_map<Language, std::vector<std::string>, std::hash<int>>; | |||
|
|
|||
| // TODO(swang): Are we worried about hash collisions with int type? | |||
| using RuntimeEnvHash = int; | |||
There was a problem hiding this comment.
Ah I had a PR that changed it to int64 but it got lost. Maybe file a backlog issue / add to the tech debt cleanup ticket.
src/ray/raylet/worker_pool.cc
Outdated
| } | ||
| }); | ||
| } else { | ||
| if (!requires_dedicated_worker) { |
There was a problem hiding this comment.
Does it make sense to unify dedicated/vs not paths (e.g., by giving dedicated workers some unique hash id?)
There was a problem hiding this comment.
Ah good idea, I didn't like how this part turned out.
ericl
added
the
@author-action-required
Co-authored-by: Eric Liang <ekhliang@gmail.com>
Co-authored-by: Eric Liang <ekhliang@gmail.com>
Co-authored-by: Eric Liang <ekhliang@gmail.com>
ericl
approved these changes
Sep 23, 2021
stephanie-wang
force-pushed
the
test-many-tasks
branch
from
d37449a to
a7c6af3
Compare
ericl
pushed a commit
that referenced
this pull request
Oct 7, 2021
2 tasks
This was referenced Dec 9, 2021
Merged
pcmoritz
pushed a commit
that referenced
this pull request
Dec 13, 2021
PR #19014 introduced the idea of a StartupToken to uniquely identify a worker via a counter. This PR: - returns the Process and the StartupToken from StartWorkerProcess (previously only Process was returned) - Change the starting_workers_to_tasks map to index via the StartupToken, which seems to fix the windows failures. - Unskip the windows tests in test_basic_2.py It seems once a fix to PR #18167 goes in, the starting_workers_to_tasks map will be removed, which should remove the need for the changes to StartWorkerProcess made in this PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why are these changes needed?
#17202 assigns tasks to specific workers if there are none available and a new worker has to be started. This is not robust because it can block the task if another worker becomes available first.
This PR converts the worker pool to queue the tasks and starting workers instead. If a worker becomes available and there is a task in the queue, we assign the task to that worker. If workers fail to start, we trigger the callbacks for all queued tasks.
Related issue number
Checks
scripts/format.shto lint the changes in this PR.