Skip to content

Commit

Permalink
[grpc] Upgrade grpc to 1.45.2 (#24064)
Browse files Browse the repository at this point in the history
Upgrade grpc to the newest version to use grpc internal implementation of retry.
  • Loading branch information
fishbone committed Apr 23, 2022
1 parent ea791ab commit 3c0a3f4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 100 deletions.
6 changes: 2 additions & 4 deletions bazel/ray_deps_setup.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,11 @@ def ray_deps_setup():
auto_http_archive(
name = "com_github_grpc_grpc",
# NOTE: If you update this, also update @boringssl's hash.
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.43.2.tar.gz",
sha256 = "b74ce7d26fe187970d1d8e2c06a5d3391122f7bc1fdce569aff5e435fb8fe780",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.45.2.tar.gz",
sha256 = "e18b16f7976aab9a36c14c38180f042bb0fd196b75c9fd6a20a2b5f934876ad6",
patches = [
"@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch",
"@com_github_ray_project_ray//thirdparty/patches:grpc-python.patch",
# Delete after upgrading from 1.44.0
"@com_github_ray_project_ray//thirdparty/patches:grpc-remove-distutils.patch",
],
)

Expand Down
2 changes: 1 addition & 1 deletion python/ray/tests/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ py_test_module_list(
"test_stress_sharded.py",
"test_tempfile.py",
"test_tensorflow.py",
"test_threaded_actor.py",
"test_tls_auth.py",
"test_ray_debugger.py",
"test_worker_capping.py",
Expand Down Expand Up @@ -219,6 +218,7 @@ py_test_module_list(
"test_cli.py",
"test_failure.py",
"test_actor_advanced.py",
"test_threaded_actor.py",
"test_stress_failure.py",
"test_reconstruction.py",
"test_failure_2.py",
Expand Down
71 changes: 8 additions & 63 deletions thirdparty/patches/grpc-python.patch
Original file line number Diff line number Diff line change
@@ -1,63 +1,8 @@
diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl
--- third_party/py/python_configure.bzl
+++ third_party/py/python_configure.bzl
@@ -177,7 +177,7 @@ def _get_bash_bin(repository_ctx):
if bash_bin != None:
return bash_bin
else:
- bash_bin_path = repository_ctx.which("bash")
+ bash_bin_path = repository_ctx.which("bash" if not _is_windows(repository_ctx) else "sh.exe")
if bash_bin_path != None:
return str(bash_bin_path)
else:
@@ -208,7 +208,7 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key):
" paths.append(path)\n" + "if len(paths) >=1:\n" +
" print(paths[0])\n" + "END"
)
- cmd = "%s - %s" % (python_bin, print_lib)
+ cmd = '"%s" - %s' % (python_bin, print_lib)
result = repository_ctx.execute([_get_bash_bin(repository_ctx), "-c", cmd])
return result.stdout.strip("\n")

@@ -293,11 +293,13 @@ def _create_single_version_package(

python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path, allow_absent)
if (python_bin == None or
- _check_python_bin(repository_ctx,
- python_bin,
- bin_path_key,
- allow_absent) == None) and allow_absent:
- python_include_rule = empty_include_rule
+ _check_python_bin(
+ repository_ctx,
+ python_bin,
+ bin_path_key,
+ allow_absent,
+ ) == None) and allow_absent:
+ python_include_rule = empty_include_rule
else:
python_lib = _get_python_lib(repository_ctx, python_bin, lib_path_key)
_check_python_lib(repository_ctx, python_lib)
@@ -348,17 +350,17 @@ def _python_autoconf_impl(repository_ctx):
repository_ctx,
"_python2",
_PYTHON2_BIN_PATH,
- "python2",
+ "python" if not _is_windows(repository_ctx) else "python.exe",
_PYTHON2_LIB_PATH,
- True
+ True,
)
_create_single_version_package(
repository_ctx,
"_python3",
_PYTHON3_BIN_PATH,
- "python3",
+ "python3" if not _is_windows(repository_ctx) else "python.exe",
_PYTHON3_LIB_PATH,
- False
+ False,
)
_tpl(repository_ctx, "BUILD")

--
178c178
< bash_bin_path = repository_ctx.which("bash")
---
> bash_bin_path = repository_ctx.which("bash" if not _is_windows(repository_ctx) else "sh.exe")
348c348
< "python3",
---
> "python3" if not _is_windows(repository_ctx) else "python.exe",
32 changes: 0 additions & 32 deletions thirdparty/patches/grpc-remove-distutils.patch

This file was deleted.

0 comments on commit 3c0a3f4

Please sign in to comment.