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

update grpc to 1.44.0 #22384

Merged
merged 1 commit into from
Mar 7, 2022
Merged

update grpc to 1.44.0 #22384

merged 1 commit into from
Mar 7, 2022

Conversation

acxz
Copy link
Contributor

@acxz acxz commented Feb 15, 2022

Why are these changes needed?

Updates grpc to 1.44.0 to remove local patch needed for grpc to build.

EDIT: there have been changes to how python is found (mostly removing python2 support) and as such the local python-patch we have for grpc needs to be modified.

This time contributing it to upstream (grpc/grpc#28895) so that it'll get added in a newer version!

For anyone that comes across this:
Here is the error itself for why we need the grpc-python.patch file: https://buildkite.com/ray-project/ray-builders-pr/builds/24659#d293616f-225d-41f9-8de2-03780f12b13f/2386-2416

Related issue number

Similar in spirit to #21866

GRPC changelog: https://github.com/grpc/grpc/releases/tag/v1.44.0

Checks

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

Relevant People:
@rkooo567

@rkooo567
Copy link
Contributor

Can you merge the latest master?

@acxz
Copy link
Contributor Author

acxz commented Feb 17, 2022

@rkooo567 should I rebase from master again or are the tests we see known to be flaky?

@mwtian
Copy link
Member

mwtian commented Feb 18, 2022

Test failures should be unrelated.

@rkooo567
Copy link
Contributor

@mwtian is the Mac cpp test unrelated? It seems a bit weird to me

@mwtian
Copy link
Member

mwtian commented Feb 19, 2022

Yeah, I didn't see the Mac C++ tests earlier. Their failures seem problematic. I will be OOO next week. If we haven't fixed it then, I can take a look.

@acxz
Copy link
Contributor Author

acxz commented Mar 3, 2022

@mwtian sorry to ping, but if you can glance at the mac test or have anyone else that has a mac machine test it out that would be wonderful.

@mwtian
Copy link
Member

mwtian commented Mar 3, 2022

@rkooo567 mentioned he will take a look, but I can give it a try tomorrow too.

@rkooo567
Copy link
Contributor

rkooo567 commented Mar 4, 2022

Yeah I had no time for this (maybe until the end of next week)

@mwtian
Copy link
Member

mwtian commented Mar 4, 2022

This is the same issue as when we upgraded grpc last time. Now it is happening for all tests.

dyld: malformed mach-o: load commands size (32912) > 32768

I think we should upgrade the CI MacOS version higher then 10.15 Catalina.

@mwtian
Copy link
Member

mwtian commented Mar 4, 2022

I created a workaround in #22829. @acxz feel free to try again after that is merged, or patch in the change and rerun the CI.

rkooo567 pushed a commit that referenced this pull request Mar 5, 2022
There are problems with running C++ tests in MacOS 10.15 Catalina, when upgrading to the newest grpc due to dynamic linking: #22384 (comment). The problem does not exist for Python tests in Catalina, or in C++ tests of other systems.

Upgrading MacOS CI from Catalina is also blocked in the short term: ray-project/reef#24 (comment)

So working around the issue by using static linking for C++ tests on Mac.
@acxz
Copy link
Contributor Author

acxz commented Mar 5, 2022

Thanks @mwtian I hadn't realized there was a blocker on updating the macos ci version or else I wouldn't have pushed so hard for this, especially considering this PR itself is not needed for getting py3.10 support (which is what I'm currently trying to resolve)

@acxz
Copy link
Contributor Author

acxz commented Mar 5, 2022

Oh just saw it got merged, let me rebase to restart the ci on this PR.

Copy link
Member

@mwtian mwtian left a comment

Choose a reason for hiding this comment

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

All tests passed, after rerunning one Windows test failure.

@rkooo567 rkooo567 merged commit 5ebc32d into ray-project:master Mar 7, 2022
@rkooo567
Copy link
Contributor

rkooo567 commented Mar 7, 2022

Thanks again for the patch!

@acxz acxz deleted the grpc-update branch March 7, 2022 15:07
@mwtian
Copy link
Member

mwtian commented Mar 9, 2022

Seeing these errors for building Windows wheels on master, which somehow did not appear during CI for this PR: https://buildkite.com/ray-project/ray-builders-branch/builds/6402#ffee35fd-ab9b-486d-bd7f-91ae876cddbf/2600-2623

(16:46:20) INFO: Repository local_config_python instantiated at:
--
  | C:/install/ray/WORKSPACE:9:19: in <toplevel>
  | C:/install/ray/bazel/ray_deps_build_all.bzl:17:12: in ray_deps_build_all
  | C:/tmp/4lhdprva/external/com_github_grpc_grpc/bazel/grpc_deps.bzl:459:21: in grpc_deps
  | C:/tmp/4lhdprva/external/com_github_grpc_grpc/bazel/grpc_python_deps.bzl:61:21: in grpc_python_deps
  | Repository rule python_configure defined at:
  | C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl:354:35: in <toplevel>
  | (16:46:20) ERROR: An error occurred during the fetch of repository 'local_config_python':
  | Traceback (most recent call last):
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 344, column 35, in _python_autoconf_impl
  | _create_single_version_package(
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 291, column 33, in _create_single_version_package
  | python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path, allow_absent)
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 165, column 14, in _get_python_bin
  | _fail("Cannot find python in PATH, please make sure " +
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 33, column 9, in _fail
  | fail("%sPython Configuration Error:%s %s\n" % (red, no_color, msg))
  | Error in fail: Python Configuration Error: Cannot find python in PATH, please make sure python is installed and add its directory in PATH, or --define PYTHON3_BIN_PATH='/something/else'.
  | PATH=C:\openjdk-16\bin;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerAdministrator\.dotnet\tools;C:\Miniconda3;C:\Miniconda3\Scripts;C:\Miniconda3\Library\bin;C:\Program Files\Git\cmd;C:\bazel;C:\msys64\mingw64\bin;C:\msys64\usr\bin

(16:46:20) ERROR: Error fetching repository: Traceback (most recent call last):
--
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 344, column 35, in _python_autoconf_impl
  | _create_single_version_package(
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 291, column 33, in _create_single_version_package
  | python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path, allow_absent)
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 165, column 14, in _get_python_bin
  | _fail("Cannot find python in PATH, please make sure " +
  | File "C:/tmp/4lhdprva/external/com_github_grpc_grpc/third_party/py/python_configure.bzl", line 33, column 9, in _fail
  | fail("%sPython Configuration Error:%s %s\n" % (red, no_color, msg))
  | Error in fail: Python Configuration Error: Cannot find python in PATH, please make sure python is installed and add its directory in PATH, or --define PYTHON3_BIN_PATH='/something/else'.
  | PATH=C:\openjdk-16\bin;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerAdministrator\.dotnet\tools;C:\Miniconda3;C:\Miniconda3\Scripts;C:\Miniconda3\Library\bin;C:\Program Files\Git\cmd;C:\bazel;C:\msys64\mingw64\bin;C:\msys64\usr\bin

(16:46:20) ERROR: BUILD.bazel:2354:12: //:python/ray/_raylet.so depends on @local_config_python//:python_headers in repository @local_config_python which failed to fetch. no such package '@local_config_python//': Python Configuration Error: Cannot find python in PATH, please make sure python is installed and add its directory in PATH, or --define PYTHON3_BIN_PATH='/something/else'.
--
  | PATH=C:\openjdk-16\bin;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerAdministrator\.dotnet\tools;C:\Miniconda3;C:\Miniconda3\Scripts;C:\Miniconda3\Library\bin;C:\Program Files\Git\cmd;C:\bazel;C:\msys64\mingw64\bin;C:\msys64\usr\bin

(16:46:20) WARNING: errors encountered while analyzing target '//:ray_pkg.out': it will not be built
......

mwtian added a commit that referenced this pull request Mar 9, 2022
@acxz
Copy link
Contributor Author

acxz commented Mar 9, 2022

Riiip, let me open up a PR and test out a patch. The solution is probably just a simple change from python to python.exe. But I am a bit worried that CI passed.

@mwtian
Copy link
Member

mwtian commented Mar 9, 2022

Great, thanks for looking into this and fixing the local path!

simon-mo pushed a commit that referenced this pull request Mar 9, 2022
@acxz acxz mentioned this pull request Mar 16, 2022
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

3 participants