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

[data] Remove ray.kill in ActorPoolMapOperator #47752

Merged
merged 7 commits into from
Sep 20, 2024

Conversation

raulchen
Copy link
Contributor

Why are these changes needed?

With #47396, now Ray Core can automatically restarts an actor when needing to resubmit tasks.
This doesn't work with ray.kill-ed actors.
This PR removes ray.kill and let ref counting garbage-collect the actors.

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Hao Chen <[email protected]>
del self._num_tasks_in_flight[actor]
del self._actor_locations[actor]
Copy link
Member

Choose a reason for hiding this comment

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

Could we add a note that we intend to refactor this with the pause API at some point?

Copy link
Contributor

@alexeykudinkin alexeykudinkin left a comment

Choose a reason for hiding this comment

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

@raulchen can you please link corresponding ticket

Comment on lines 650 to 651
assert actor not in self._num_tasks_in_flight
assert actor not in self._actor_locations
Copy link
Contributor

Choose a reason for hiding this comment

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

Why we're asserting after modified the state?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the assert is for a different dict.
it's to make sure the actor handle is not being ref'ed by any of these 3 dicts

Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Hao Chen <[email protected]>
@raulchen raulchen enabled auto-merge (squash) September 20, 2024 18:56
@github-actions github-actions bot added the go add ONLY when ready to merge, run all tests label Sep 20, 2024
@raulchen raulchen merged commit 0bc22d0 into ray-project:master Sep 20, 2024
7 checks passed
@raulchen raulchen deleted the actor-pool-scale-down branch September 20, 2024 22:15
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
With ray-project#47396, now Ray Core can
automatically restarts an actor when needing to resubmit tasks.
This doesn't work with `ray.kill`-ed actors.
This PR removes ray.kill and let ref counting garbage-collect the
actors.

---------

Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: ujjawal-khare <[email protected]>
raulchen pushed a commit that referenced this pull request Nov 9, 2024
#47752 introduced a minor, silent
issue in test_map.
I stumbled across it because a linter I'm using complained.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
go add ONLY when ready to merge, run all tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants