-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
[Serve] Patching ActorProxyWrapper to properly handle is_drained
RPC
#41744
Conversation
Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defer approval to @GeneDer
# assert proxy_state._actor_proxy_wrapper.get_num_health_checks() == 10 | ||
# assert proxy_state._actor_proxy_wrapper.get_num_drain_checks() == 9 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
intentionally commented out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 on those commented out code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, forgot to remove, asserting on these is currently meaningless unfortunately.
I'm planning to supersede this by https://github.com/ray-project/ray/pull/41722/files
if is_drained: | ||
return ProxyWrapperCallStatus.FINISHED_SUCCEED | ||
else: | ||
# NOTE: Even though call returned successfully, we have to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update the docstring above to match this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if there's much value since this is just a temporary cherry-pick and it's gonna be replaced by https://github.com/ray-project/ray/pull/41722/files anyway
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this case Alexey! Just make sure to address the points Ed commented
# assert proxy_state._actor_proxy_wrapper.get_num_health_checks() == 10 | ||
# assert proxy_state._actor_proxy_wrapper.get_num_drain_checks() == 9 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 on those commented out code
#41744) This is a minified version of https://github.com/ray-project/ray/pull/41722/files, specifically put to be cherry-picked into 2.9 Addresses #41726 --------- Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
#41744) (#41755) This is a minified version of https://github.com/ray-project/ray/pull/41722/files, specifically put to be cherry-picked into 2.9 Addresses #41726 Addresses following gaps: Patches ActorProxyWrapper.is_drained method to handle RPC response properly Cherry-picks a test from [Serve] Revisiting ProxyState to fix draining sequence #41722 to validate draining sequence is correct --------- Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
This is a minified version of https://github.com/ray-project/ray/pull/41722/files, specifically put to be cherry-picked into 2.9
Addresses #41726
Addresses following gaps:
ActorProxyWrapper.is_drained
method to handle RPC response properlyProxyState
to fix draining sequence #41722 to validate draining sequence is correctChecks
git commit -s
) in this PR.scripts/format.sh
to lint the changes in this PR.method in Tune, I've added it in
doc/source/tune/api/
under thecorresponding
.rst
file.