Skip to content

Backport win2019 and VS2019 related changes to v1.53.x#32703

Merged
jtattermusch merged 4 commits intogrpc:v1.53.xfrom
jtattermusch:win_image_backports
Mar 24, 2023
Merged

Backport win2019 and VS2019 related changes to v1.53.x#32703
jtattermusch merged 4 commits intogrpc:v1.53.xfrom
jtattermusch:win_image_backports

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch commented Mar 24, 2023

Backports #32678, #32669, #32668, #32662

After this, all windows builds on 1.53.x should be using VS2019 and they should be stable.

…grpc#32678)

Try to react to protocolbuffers/protobuf#12263
and protocolbuffers/protobuf#12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of
/CMakeLists.txt


https://github.com/protocolbuffers/protobuf/blob/58ecf38aa521ba812a0c1a0ae9f108dd311c739c/cmake/CMakeLists.txt#L3

In this PR:
- Adjust `cmake/protobuf.cmake` to use the right CMakeLists.txt
- adjust the C++ distribtests accordingly
After switching to grpc-win2019 kokoro image, the windows C++
distribtest got slightly slower (from about ~1500sec to ~1650sec), which
got us too close to the 1800sec time limit and thus we've seen the
windows distribtests occasionally time out.

I'd still like to look into speeding up the distribtests, but for now we
don't want frequest test timeouts in the CI.

example failure: 

https://fusion2.corp.google.com/ci;ids=1923284992/kokoro/prod:grpc%2Fcore%2Fmaster%2Fwindows%2Fgrpc_distribtests_standalone/activity/996fd2cf-bef3-4490-85da-a52765d84127/log

```
2023-03-20 23:43:44,740 TIMEOUT: distribtest.cpp_windows_x86_cmake_as_externalproject [pid=5984, time=1800.1sec]
```
Try to avoid the `ccache: error: Failed to read from file stream` build
failures that started happening once we upgraded to the grpc-win2019
image.

e.g.
https://source.cloud.google.com/results/invocations/e94c2f35-6d1f-4d89-853a-be7e1e1747de/targets/github%2Fgrpc%2Ftoplevel_run_tests_invocations%2Frun_tests_c_windows_opt_native/tests

```
C:\ccache\ccache.exe C:\PROGRA~2\MICROS~1\2017\COMMUN~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x86\cl.exe  /nologo /TP -DCARES_STATICLIB -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WIN32_WINNT=0x600 -D_WINSOCK_DEPRECATED_NO_WARNINGS -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\re2 -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\zlib -IT:\altsrc\github\grpc\workspace_c_windows_opt_native -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\include -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\address_sorting\include -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\cmake\build\third_party\re2 -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\boringssl-with-bazel\src\include -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\src\core\ext\upb-generated -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\src\core\ext\upbdefs-generated -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\upb -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\xxhash -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\cmake\build\third_party\zlib -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\abseil-cpp -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\cmake\build\third_party\cares\cares -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\cares\cares -IT:\altsrc\github\grpc\workspace_c_windows_opt_native\third_party\cares\cares\include /DWIN32 /D_WINDOWS /W3 /GR /EHsc  /MP8 /wd4065 /wd4506 /wd4200 /wd4291 /wd4244 /wd4267 /wd4987 /wd4774 /wd4819 /wd4996 /wd4619 /wd4503 /utf-8 /MD /O2 /Ob2 /DNDEBUG /showIncludes /FoCMakeFiles\invalid_call_argument_test.dir\test\core\end2end\cq_verifier.cc.obj /FdCMakeFiles\invalid_call_argument_test.dir\ /FS -c T:\altsrc\github\grpc\workspace_c_windows_opt_native\test\core\end2end\cq_verifier.cc
ccache: error: Failed to read from file stream
```
(part of removing support for VS2017)

Also see grpc#32649
Also see grpc#32615

The switch to grpc-win2019 windows workers has already happened:
(cl/517400022).

Once this PR lands, I'll backport to 1.53.x branch as well (since that
release removes the VS2017 support).
@jtattermusch jtattermusch merged commit 82020d1 into grpc:v1.53.x Mar 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants