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

[Serve] fix control+c after serve run doesn't shutdown serve components #45087

Merged

Conversation

GeneDer
Copy link
Contributor

@GeneDer GeneDer commented May 1, 2024

Why are these changes needed?

Added a test to ensure this is captured and fix it.

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: Gene Su <e870252314@gmail.com>
Signed-off-by: Gene Su <e870252314@gmail.com>
@GeneDer GeneDer requested a review from edoakes May 1, 2024 23:56
@GeneDer GeneDer marked this pull request as ready for review May 1, 2024 23:56
@GeneDer GeneDer self-assigned this May 1, 2024
Copy link
Contributor

@edoakes edoakes left a comment

Choose a reason for hiding this comment

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

Thanks Gene!

python/ray/serve/api.py Outdated Show resolved Hide resolved
@@ -964,5 +964,27 @@ def test_serve_run_mount_to_correct_deployment_route_prefix(ray_start_stop):
)


@pytest.mark.skipif(sys.platform == "win32", reason="File path incorrect on Windows.")
def test_control_c_shutdown_serve_components(ray_start_stop):
Copy link
Contributor

Choose a reason for hiding this comment

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

I presume you tested that this fails w/o your change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep, I purposely push a commit with just the test trying to see this failing in CI with the serve component still alive as well https://buildkite.com/ray-project/premerge/builds/25316#018f3652-b00a-45a2-aadc-ca46fb8d4f5d/182-3706

Signed-off-by: Gene Su <e870252314@gmail.com>
@edoakes edoakes merged commit d84f265 into ray-project:master May 2, 2024
5 checks passed
@GeneDer GeneDer deleted the fix-serve-control-c-does-not-shutdown branch May 2, 2024 15:52
harborn pushed a commit to harborn/ray that referenced this pull request May 8, 2024
…ents (ray-project#45087)

Added a test to ensure this is captured and fix it.
peytondmurray pushed a commit to peytondmurray/ray that referenced this pull request May 13, 2024
…ents (ray-project#45087)

Added a test to ensure this is captured and fix it.
Signed-off-by: pdmurray <peynmurray@gmail.com>
ryanaoleary pushed a commit to ryanaoleary/ray that referenced this pull request Jun 6, 2024
…ents (ray-project#45087)

Added a test to ensure this is captured and fix it.

Signed-off-by: Ryan O'Leary <ryanaoleary@google.com>
ryanaoleary pushed a commit to ryanaoleary/ray that referenced this pull request Jun 7, 2024
…ents (ray-project#45087)

Added a test to ensure this is captured and fix it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants