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] Remove old grpc code #39863

Merged
merged 18 commits into from
Sep 28, 2023
Merged

Conversation

sihanwang41
Copy link
Contributor

@sihanwang41 sihanwang41 commented Sep 26, 2023

Why are these changes needed?

  1. Remove is_driver_deployment API
  2. Remove the grpc driver
  3. Remove driver deployment.
  4. Rmove disable_httpproxy flag
  5. Remove related unit tests
  6. Remove old gRPC proto schema

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

try:
# Depending on whether RAY_USE_TLS is on, `add_port_to_grpc_server`
# can create a secure or insecure channel
self.grpc_port = add_port_to_grpc_server(self.server, address)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@GeneDer do we support TLS (secure channel) in the current grpc proxy?

Copy link
Contributor

Choose a reason for hiding this comment

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

Right now it's just using unsecured port https://github.com/ray-project/ray/blob/master/python/ray/serve/_private/proxy.py#L1617 But adding support should be pretty easy.

Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
@@ -151,49 +147,41 @@ def _start_controller(
"max_concurrency": CONTROLLER_MAX_CONCURRENCY,
}

if FLAG_DISABLE_PROXY:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

no logic change, only remove the if case

@@ -1605,7 +1606,8 @@ async def run_grpc_server(self):
grpc_server = create_serve_grpc_server(
service_handler_factory=self.grpc_proxy.service_handler_factory,
)
grpc_server.add_insecure_port(f"[::]:{self.grpc_port}")

add_port_to_grpc_server(grpc_server, f"[::]:{self.grpc_port}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add TLS support

Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
Signed-off-by: Sihan Wang <[email protected]>
@sihanwang41 sihanwang41 marked this pull request as ready for review September 27, 2023 03:30
@sihanwang41 sihanwang41 requested a review from a team September 27, 2023 17:34
@edoakes
Copy link
Contributor

edoakes commented Sep 27, 2023

@sihanwang41 could you please separate (7) out into its own PR so this is purely removing the existing stuff?

Signed-off-by: Sihan Wang <[email protected]>
@sihanwang41
Copy link
Contributor Author

@sihanwang41 could you please separate (7) out into its own PR so this is purely removing the existing stuff?

done

@edoakes edoakes merged commit 53ba26f into ray-project:master Sep 28, 2023
96 of 102 checks passed
vymao pushed a commit to vymao/ray that referenced this pull request Oct 11, 2023
1. Remove is_driver_deployment API
2. Remove the grpc driver
3. Remove driver deployment.
4. Rmove disable_httpproxy flag
5. Remove related unit tests
6. Remove old gRPC proto schema

Signed-off-by: Victor <[email protected]>
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

4 participants