[pull] master from grpc:master #325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
github-actions
bot
added
lang/c++
lang/core
lang/python
area/infra
lang/C#
lang/ObjC
lang/php
lang/ruby
labels
And cache-align InterSliceState.
Breaks internal tests
This is a follow-up PR of #34191, which handles the error condition of endpoints failed to write/read in chaotic-good client transport. This PR needs to be merged after #34191. <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. -->
Add a config to experiments & rollouts to allow dependent experiments to be flagged. We're getting past the point where it's possible to reason about which experiments need to be turned off if we disable some other experiment, and so this provides some additional rollout safety. Can be specified in both experiments and rollouts: experiments.yaml makes the most sense and we should default to it, but rollouts.yaml lets us put dependencies between internal & external dependencies internally and that's gonna be a little useful. --------- Co-authored-by: ctiller <[email protected]>
Modeled after mutexes in the Rust ecosystem: the mutex owns the data provided, and acquisition of the mutex returns a handle with which to manipulate that data. This fits in nicely with the execution environment we've established whereby we may want to pass the lock from lambda to lambda for some time. --------- Co-authored-by: ctiller <[email protected]>
The current fixed minimum starting thread count (2 threads), combined with the fixed thread spawn rate limit of 1/sec, was causing test issues with some new EventEngine integrations. For example, this test had a race wherein the alarm destructor was expected to run within 1 second. In 5% of runs, the 2 EventEngine threads were otherwise occupied, and it would take around 1 second to spawn a new thread. https://github.com/grpc/grpc/blob/1e15d00ec4d6eba6bd20621fc72ad51d0f62b654/test/cpp/common/alarm_test.cc#L418-L435
…34902) The plumbing is a little messy here, but I didn't see an obvious way to improve it without a lot of work.
Reverts #34880, needs to be cherry-picked in.
Design is documented at [go/windows-dns-resolver-issue](http://go/windows-dns-resolver-issue) (note that the design doc is slightly outdated regarding the shared ownership model of the virtual socket that was implemented in 13bd2b4). Passed `//test/cpp/naming:resolver_component_tests_runner_invoker` and `//test/cpp/naming:cancel_ares_query_test`: ``` C:\Users\yijiem\projects\grpc>bazel --output_base=C:\bazel6 test --dynamic_mode=off --verbose_failures --test_env=GRPC_EXPERIMENTS=event_engine_dns --test_env=GRPC_VERBOSITY=debug --test_env=GRPC_TRACE=cares_resolver --enable_runfiles=yes --nocache_test_results //test/cpp/naming:resolver_component_tests_runner_invoker INFO: Analyzed target //test/cpp/naming:resolver_component_tests_runner_invoker (1 packages loaded, 8 targets configured). INFO: Found 1 test target... INFO: From Compiling src/core/lib/event_engine/windows/windows_engine.cc: C:\bazel6\execroot\com_github_grpc_grpc\src/core/lib/channel/channel_args.h(287): warning C4312: 'reinterpret_cast': conversion from 'int' to 'void *' of greater size Target //test/cpp/naming:resolver_component_tests_runner_invoker up-to-date: bazel-bin/test/cpp/naming/resolver_component_tests_runner_invoker.exe INFO: Elapsed time: 230.374s, Critical Path: 228.54s INFO: 9 processes: 2 internal, 7 local. INFO: Build completed successfully, 9 total actions //test/cpp/naming:resolver_component_tests_runner_invoker PASSED in 221.2s Executed 1 out of 1 test: 1 test passes. ``` ``` C:\Users\yijiem\projects\grpc>bazel --output_base=C:\bazel6 test --dynamic_mode=off --verbose_failures --test_env=GRPC_EXPERIMENTS=event_engine_dns --test_env=GRPC_VERBOSITY=debug --test_env=GRPC_TRACE=cares_resolver --enable_runfiles=yes --nocache_test_results //test/cpp/naming:cancel_ares_query_test INFO: Analyzed target //test/cpp/naming:cancel_ares_query_test (0 packages loaded, 0 targets configured). INFO: Found 1 test target... Target //test/cpp/naming:cancel_ares_query_test up-to-date: bazel-bin/test/cpp/naming/cancel_ares_query_test.exe INFO: Elapsed time: 49.656s, Critical Path: 48.00s INFO: 6 processes: 2 internal, 4 local. INFO: Build completed successfully, 6 total actions //test/cpp/naming:cancel_ares_query_test PASSED in 43.0s Executed 1 out of 1 test: 1 test passes. ``` <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. -->
So that users can process annotations other than calling ToString(). <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. -->
Part of the work needed for in-progress gRFC A75 (grpc/proposal#405). Closes #35395 PiperOrigin-RevId: 597064473
…last-used time rather than EDS health state (#35397) Part of the work needed for in-progress gRFC A75 (grpc/proposal#405). Closes #35397 COPYBARA_INTEGRATE_REVIEW=#35397 from markdroth:xds_ssa_subchannel_management_revamp 8902dea PiperOrigin-RevId: 597288930
Add token based authentication example <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. -->
(Required recursively splitting some other targets too) Gets us closer to eliminating `grpc_base`, and (more importantly) sets up some pieces of transport to be split out so I can rebuild them in coming months. Closes #35496 COPYBARA_INTEGRATE_REVIEW=#35496 from ctiller:chipchip 5319fb9 PiperOrigin-RevId: 597304996
Implements the aggregate cluster changes described in gRFC A75 (grpc/proposal#405). Closes #35313 COPYBARA_INTEGRATE_REVIEW=#35313 from markdroth:xds_aggregate_cluster_fix 85cfd70 PiperOrigin-RevId: 597326624
<!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> Closes #35494 COPYBARA_INTEGRATE_REVIEW=#35494 from yijiem:fix-release-note-script ed04b18 PiperOrigin-RevId: 597327879
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.18. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/urllib3/urllib3/releases">urllib3's releases</a>.</em></p> <blockquote> <h2>1.26.18</h2> <ul> <li>Made body stripped from HTTP requests changing the request method to GET after HTTP 303 "See Other" redirect responses. (GHSA-g4mx-q9vg-27p4)</li> </ul> <h2>1.26.17</h2> <ul> <li>Added the <code>Cookie</code> header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via <code>Retry.remove_headers_on_redirect</code>. (GHSA-v845-jxx5-vc9f)</li> </ul> <h2>1.26.16</h2> <ul> <li>Fixed thread-safety issue where accessing a <code>PoolManager</code> with many distinct origins would cause connection pools to be closed while requests are in progress (<a href="https://redirect.github.com/urllib3/urllib3/issues/2954">#2954</a>)</li> </ul> <h2>1.26.15</h2> <ul> <li>Fix socket timeout value when HTTPConnection is reused (<a href="https://redirect.github.com/urllib3/urllib3/issues/2645">urllib3/urllib3#2645</a>)</li> <li>Remove "!" character from the unreserved characters in IPv6 Zone ID parsing (<a href="https://redirect.github.com/urllib3/urllib3/issues/2899">urllib3/urllib3#2899</a>)</li> <li>Fix IDNA handling of 'x80' byte (<a href="https://redirect.github.com/urllib3/urllib3/issues/2901">urllib3/urllib3#2901</a>)</li> </ul> <h2>1.26.14</h2> <ul> <li>Fixed parsing of port 0 (zero) returning None, instead of 0 (<a href="https://redirect.github.com/urllib3/urllib3/issues/2850">#2850</a>)</li> <li>Removed deprecated <code>HTTPResponse.getheaders()</code> calls in <code>urllib3.contrib</code> module.</li> </ul> <h2>1.26.13</h2> <ul> <li>Deprecated the <code>HTTPResponse.getheaders()</code> and <code>HTTPResponse.getheader()</code> methods.</li> <li>Fixed an issue where parsing a URL with leading zeroes in the port would be rejected even when the port number after removing the zeroes was valid.</li> <li>Fixed a deprecation warning when using cryptography v39.0.0.</li> <li>Removed the <code><4</code> in the <code>Requires-Python</code> packaging metadata field.</li> </ul> <h2>1.26.12</h2> <ul> <li>Deprecated the <code>urllib3[secure]</code> extra and the <code>urllib3.contrib.pyopenssl</code> module. Both will be removed in v2.x. See this <a href="https://redirect.github.com/urllib3/urllib3/issues/2680">GitHub issue</a> for justification and info on how to migrate.</li> </ul> <h2>1.26.11</h2> <p><strong>If you or your organization rely on urllib3 consider supporting us via <a href="https://github.com/sponsors/urllib3">GitHub Sponsors</a>.</strong></p> <p>:warning: <strong>urllib3 v2.0 will drop support for Python 2</strong>: <a href="https://urllib3.readthedocs.io/en/latest/v2-roadmap.html">Read more in the v2.0 Roadmap</a></p> <ul> <li>Fixed an issue where reading more than 2 GiB in a call to HTTPResponse.read would raise an OverflowError on Python 3.9 and earlier.</li> </ul> <h2>1.26.10</h2> <p><strong>If you or your organization rely on urllib3 consider supporting us via <a href="https://github.com/sponsors/urllib3">GitHub Sponsors</a>.</strong></p> <p>:warning: <strong>urllib3 v2.0 will drop support for Python 2</strong>: <a href="https://urllib3.readthedocs.io/en/latest/v2-roadmap.html">Read more in the v2.0 Roadmap</a></p> <p>:closed_lock_with_key: <strong>This is the first release to be signed with Sigstore!</strong> You can verify the distributables using the <code>.sig</code> and <code>.crt</code> files included on this release.</p> <ul> <li>Removed support for Python 3.5</li> <li>Fixed an issue where a <code>ProxyError</code> recommending configuring the proxy as HTTP instead of HTTPS could appear even when an HTTPS proxy wasn't configured.</li> </ul> <h2>1.26.9</h2> <p><strong>If you or your organization rely on urllib3 consider supporting us via <a href="https://github.com/sponsors/urllib3">GitHub Sponsors</a>.</strong></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/urllib3/urllib3/blob/main/CHANGES.rst">urllib3's changelog</a>.</em></p> <blockquote> <h1>1.26.18 (2023-10-17)</h1> <ul> <li>Made body stripped from HTTP requests changing the request method to GET after HTTP 303 "See Other" redirect responses.</li> </ul> <h1>1.26.17 (2023-10-02)</h1> <ul> <li>Added the <code>Cookie</code> header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via <code>Retry.remove_headers_on_redirect</code>. (<code>[#3139](urllib3/urllib3#3139) <https://github.com/urllib3/urllib3/pull/3139></code>_)</li> </ul> <h1>1.26.16 (2023-05-23)</h1> <ul> <li>Fixed thread-safety issue where accessing a <code>PoolManager</code> with many distinct origins would cause connection pools to be closed while requests are in progress (<code>[#2954](urllib3/urllib3#2954) <https://github.com/urllib3/urllib3/pull/2954></code>_)</li> </ul> <h1>1.26.15 (2023-03-10)</h1> <ul> <li>Fix socket timeout value when <code>HTTPConnection</code> is reused (<code>[#2645](urllib3/urllib3#2645) <https://github.com/urllib3/urllib3/issues/2645></code>__)</li> <li>Remove "!" character from the unreserved characters in IPv6 Zone ID parsing (<code>[#2899](urllib3/urllib3#2899) <https://github.com/urllib3/urllib3/issues/2899></code>__)</li> <li>Fix IDNA handling of '\x80' byte (<code>[#2901](urllib3/urllib3#2901) <https://github.com/urllib3/urllib3/issues/2901></code>__)</li> </ul> <h1>1.26.14 (2023-01-11)</h1> <ul> <li>Fixed parsing of port 0 (zero) returning None, instead of 0. (<code>[#2850](urllib3/urllib3#2850) <https://github.com/urllib3/urllib3/issues/2850></code>__)</li> <li>Removed deprecated getheaders() calls in contrib module. Fixed the type hint of <code>PoolKey.key_retries</code> by adding <code>bool</code> to the union. (<code>[#2865](urllib3/urllib3#2865) <https://github.com/urllib3/urllib3/issues/2865></code>__)</li> </ul> <h1>1.26.13 (2022-11-23)</h1> <ul> <li>Deprecated the <code>HTTPResponse.getheaders()</code> and <code>HTTPResponse.getheader()</code> methods.</li> <li>Fixed an issue where parsing a URL with leading zeroes in the port would be rejected even when the port number after removing the zeroes was valid.</li> <li>Fixed a deprecation warning when using cryptography v39.0.0.</li> <li>Removed the <code><4</code> in the <code>Requires-Python</code> packaging metadata field.</li> </ul> <h1>1.26.12 (2022-08-22)</h1> <ul> <li>Deprecated the <code>urllib3[secure]</code> extra and the <code>urllib3.contrib.pyopenssl</code> module. Both will be removed in v2.x. See this <code>GitHub issue <https://github.com/urllib3/urllib3/issues/2680></code>_ for justification and info on how to migrate.</li> </ul> <h1>1.26.11 (2022-07-25)</h1> <ul> <li>Fixed an issue where reading more than 2 GiB in a call to <code>HTTPResponse.read</code> would</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/urllib3/urllib3/commit/9c2c2307dd1d6af504e09aac0326d86ee3597a0b"><code>9c2c230</code></a> Release 1.26.18 (<a href="https://redirect.github.com/urllib3/urllib3/issues/3159">#3159</a>)</li> <li><a href="https://github.com/urllib3/urllib3/commit/b594c5ceaca38e1ac215f916538fb128e3526a36"><code>b594c5c</code></a> Merge pull request from GHSA-g4mx-q9vg-27p4</li> <li><a href="https://github.com/urllib3/urllib3/commit/944f0eb134485f41bc531be52de12ba5a37bca73"><code>944f0eb</code></a> [1.26] Use vendored six in urllib3.contrib.securetransport</li> <li><a href="https://github.com/urllib3/urllib3/commit/c9016bf464751a02b7e46f8b86504f47d4238784"><code>c9016bf</code></a> Release 1.26.17</li> <li><a href="https://github.com/urllib3/urllib3/commit/01220354d389cd05474713f8c982d05c9b17aafb"><code>0122035</code></a> Backport GHSA-v845-jxx5-vc9f (<a href="https://redirect.github.com/urllib3/urllib3/issues/3139">#3139</a>)</li> <li><a href="https://github.com/urllib3/urllib3/commit/e63989f97d206e839ab9170c8a76e3e097cc60e8"><code>e63989f</code></a> Fix installing <code>brotli</code> extra on Python 2.7</li> <li><a href="https://github.com/urllib3/urllib3/commit/2e7a24d08713a0131f0b3c7197889466d645cc49"><code>2e7a24d</code></a> [1.26] Configure OS for RTD to fix building docs</li> <li><a href="https://github.com/urllib3/urllib3/commit/57181d6ea910ac7cb2ff83345d9e5e0eb816a0d0"><code>57181d6</code></a> [1.26] Improve error message when calling urllib3.request() (<a href="https://redirect.github.com/urllib3/urllib3/issues/3058">#3058</a>)</li> <li><a href="https://github.com/urllib3/urllib3/commit/3c0148048a523325819377b23fc67f8d46afc3aa"><code>3c01480</code></a> [1.26] Run coverage even with failed jobs</li> <li><a href="https://github.com/urllib3/urllib3/commit/d94029b7e2193ff47b627906a70e06377a09aae8"><code>d94029b</code></a> Release 1.26.16</li> <li>Additional commits viewable in <a href="https://github.com/urllib3/urllib3/compare/1.26.5...1.26.18">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/grpc/grpc/network/alerts). </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Closes #34714 COPYBARA_INTEGRATE_REVIEW=#34714 from grpc:dependabot/pip/urllib3-1.26.18 3281b12 PiperOrigin-RevId: 597334547
Moved to https://github.com/grpc/psm-interop/blob/270307afe01878b5d54e8a0e2ef01e50e599e750/.github/workflows/psm-interop.yaml. This created as a companion to #35466 to split out github-only files change go/github-only-files-grpc.
Recently two more openssl tests were added to the portability test suite. At-head tests are using the same set, having an unintended big surge in the test time, causing timeout. So I've changed at-head tests not to run openssl tests. Closes #35520 COPYBARA_INTEGRATE_REVIEW=#35520 from veblush:at-head-diet d0fc79d PiperOrigin-RevId: 597634232
New source of truth: https://github.com/grpc/psm-interop. This PR removes PSM Interop framework source code from `tools/run_tests/xds_k8s_test_driver`, and all references to it. Closes #35466 PiperOrigin-RevId: 597636949
…Tracer (#35210) <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> Closes #35210 COPYBARA_INTEGRATE_REVIEW=#35210 from yijiem:csm-service-label 6a6a7d1 PiperOrigin-RevId: 597641393
We're having some issues internally, rolling this change back for now and wait for the affected users to figure out a solution. This reverts: #35002, #35482 and 6872a7a <!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> Closes #35522 PiperOrigin-RevId: 597671989
…35532) It looks like this ended up getting deleted in #34350 probably when merging. Also, the `Init` method in the otel test library is getting unwieldy. I'm going to send out a follow-up PR to convert this into a builder instead. Closes #35532 COPYBARA_INTEGRATE_REVIEW=#35532 from yashykt:OTelPluginBuilderFix 372bf26 PiperOrigin-RevId: 597846622
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )