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] Shutdown http proxy state (cherry-pick) #35446

Merged
merged 2 commits into from
May 18, 2023

Conversation

zcin
Copy link
Contributor

@zcin zcin commented May 17, 2023

Why are these changes needed?

Cherry pick #35395 and #35439

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 :(

Shutdown http proxy state so that it won't run anything in its update loop once a shutdown signal is received.

Signed-off-by: Cindy Zhang <cindyzyx9@gmail.com>
Copy link
Collaborator

@zhe-thoughts zhe-thoughts left a comment

Choose a reason for hiding this comment

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

Approved for picking into 2.5.0

@cadedaniel
Copy link
Member

this breaks lint #35454

@cadedaniel
Copy link
Member

remove print statement from the cherry pick.

also it's a bad idea to modify cherry picks.. makes it really hard to debug failures on the release branch. we should cherry pick only the commit from master, no modifications!

cc @ArturNiederfahrenhorst @can-anyscale

Copy link
Member

@cadedaniel cadedaniel left a comment

Choose a reason for hiding this comment

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

this breaks lint #35454

remove print statement from the cherry pick.

also it's a bad idea to modify cherry picks.. makes it really hard to debug failures on the release branch. we should cherry pick only the commit from master, no modifications!

cc @ArturNiederfahrenhorst @can-anyscale

@zhe-thoughts
Copy link
Collaborator

Thanks @cadedaniel . Yup I should've looked more carefully myself

@zcin Could you please address Cade's comments (especially the CI breakage)? Thanks

Signed-off-by: Cindy Zhang <cindyzyx9@gmail.com>
@zcin
Copy link
Contributor Author

zcin commented May 17, 2023

CI is fixed, and all commits on this PR are now cherry-picked from master.
(there are 2 commits because the first commit introduces issues, the second commit fixes them)

Serve test failures (I believe both should be fixed by #35426):

  • linux test_standalone2: failing on release branch
  • windows test_http_state: failing on release branch

Other tests seem unrelated.

@zcin zcin requested review from cadedaniel and zhe-thoughts May 17, 2023 22:56
Copy link
Member

@cadedaniel cadedaniel left a comment

Choose a reason for hiding this comment

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

LGTM. test_multiprocessing_client_mode is failing but also on master.

@ArturNiederfahrenhorst ArturNiederfahrenhorst merged commit f1f4d69 into ray-project:releases/2.5.0 May 18, 2023
@zcin zcin deleted the cp-1bd30c3 branch September 8, 2023 19:00
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.

5 participants