netty:Fix Netty composite buffer merging to be compatible with Netty 4.1.111 (1.64.x backport) #11303
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
…4.1.111 (grpc#11294) * Use addComponent instead of addFlattenedComponent and do not append to components that are composites.
ejona86
approved these changes
Jun 21, 2024
sergiitk
approved these changes
Jun 21, 2024
renovate bot
added a commit
to TBD54566975/ftl
that referenced
this pull request
Jul 1, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | Type | Update | |---|---|---|---|---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | `v1.30.0` -> `v1.30.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch | | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | `v1.27.21` -> `v1.27.23` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | `v1.17.21` -> `v1.17.23` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch | | [github.com/aws/aws-sdk-go-v2/service/secretsmanager](https://togithub.com/aws/aws-sdk-go-v2) | `v1.31.1` -> `v1.32.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | minor | | [github.com/aws/smithy-go](https://togithub.com/aws/smithy-go) | `v1.20.2` -> `v1.20.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | require | patch | | [postcss](https://postcss.org/) ([source](https://togithub.com/postcss/postcss)) | [`8.4.38` -> `8.4.39`](https://renovatebot.com/diffs/npm/postcss/8.4.38/8.4.39) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | devDependencies | patch | | [shalzz/zola-deploy-action](https://togithub.com/shalzz/zola-deploy-action) | `v0.18.0` -> `v0.19.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | action | minor | | [org.junit:junit-bom](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.10.2` -> `5.10.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | import | patch | | [io.grpc:grpc-stub](https://togithub.com/grpc/grpc-java) | `1.64.0` -> `1.65.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | compile | minor | | [io.grpc:grpc-protobuf](https://togithub.com/grpc/grpc-java) | `1.64.0` -> `1.65.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | compile | minor | | [io.grpc:grpc-netty](https://togithub.com/grpc/grpc-java) | `1.64.0` -> `1.65.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | compile | minor | --- ### Release Notes <details> <summary>aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2)</summary> ### [`v1.30.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.30.0...v1.30.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.30.0...v1.30.1) </details> <details> <summary>aws/smithy-go (github.com/aws/smithy-go)</summary> ### [`v1.20.3`](https://togithub.com/aws/smithy-go/compare/v1.20.2...v1.20.3) [Compare Source](https://togithub.com/aws/smithy-go/compare/v1.20.2...v1.20.3) </details> <details> <summary>postcss/postcss (postcss)</summary> ### [`v8.4.39`](https://togithub.com/postcss/postcss/blob/HEAD/CHANGELOG.md#8439) [Compare Source](https://togithub.com/postcss/postcss/compare/8.4.38...8.4.39) - Fixed `CssSyntaxError` types (by [@​romainmenke](https://togithub.com/romainmenke)). </details> <details> <summary>shalzz/zola-deploy-action (shalzz/zola-deploy-action)</summary> ### [`v0.19.1`](https://togithub.com/shalzz/zola-deploy-action/releases/tag/v0.19.1) [Compare Source](https://togithub.com/shalzz/zola-deploy-action/compare/v0.18.0...v0.19.1) #### What's Changed - create .nojekyll file in OUT_DIR by [@​eugene-babichenko](https://togithub.com/eugene-babichenko) in [shalzz/zola-deploy-action#84 #### New Contributors - [@​eugene-babichenko](https://togithub.com/eugene-babichenko) made their first contribution in [shalzz/zola-deploy-action#84 **Full Changelog**: shalzz/zola-deploy-action@v0.18.0...v0.19.1 </details> <details> <summary>grpc/grpc-java (io.grpc:grpc-stub)</summary> ### [`v1.65.0`](https://togithub.com/grpc/grpc-java/compare/v1.64.0...v1.65.0) ### [`v1.64.1`](https://togithub.com/grpc/grpc-java/releases/tag/v1.64.1) ##### What's Changed - netty:Fix Netty composite buffer merging to be compatible with Netty 4.1.111 (1.64.x backport) by [@​larry-safran](https://togithub.com/larry-safran) in [grpc/grpc-java#11303 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/TBD54566975/ftl). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
kodiakhq bot
pushed a commit
to cloudquery/plugin-pb-java
that referenced
this pull request
Jul 1, 2024
](https://renovatebot.com){kind=link}
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [io.grpc:protoc-gen-grpc-java](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-testing](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-netty-shaded](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-stub](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-services](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-protobuf](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | --- ### Release Notes <details> <summary>grpc/grpc-java (io.grpc:protoc-gen-grpc-java)</summary> ### [`v1.65.0`](https://togithub.com/grpc/grpc-java/releases/tag/v1.65.0) grpc-netty in this release is compatible with Netty 4.1.111; it fixes the incompatibility that caused data corruption. grpc-netty-shaded is still using Netty 4.1.100. ##### New Features - New module grpc-gcp-csm-observability ([`df8cfe9`](https://togithub.com/grpc/grpc-java/commit/df8cfe9dd)) ##### Improvements - api: Add `ClientStreamTracer.inboundHeaders(Metadata)` ([`960012d`](https://togithub.com/grpc/grpc-java/commit/960012d76)). This is the same as the existing `inboundHeaders()`, but is provided the Metadata - api: Fix various typos in the documentation ([#​11144](https://togithub.com/grpc/grpc-java/issues/11144)) ([`6ec744f`](https://togithub.com/grpc/grpc-java/commit/6ec744f2a)) - core: When queuing RPCs, don’t request picks from the LB twice ([`8844cf7`](https://togithub.com/grpc/grpc-java/commit/8844cf7b8)). This could be viewed as a small performance optimization, but mainly reduces the amount of race-handling code - util: Improve AdvancedTlsX509KeyManager’s documentation, verification, and testing. ([#​11139](https://togithub.com/grpc/grpc-java/issues/11139)) ([`781b4c4`](https://togithub.com/grpc/grpc-java/commit/781b4c457)) This change shows `@ExperimentalApi` being removed, but it was re-added in [`3c97245`](https://togithub.com/grpc/grpc-java/commit/3c97245) before the release - examples: Fix broken command in reflection readme ([#​11131](https://togithub.com/grpc/grpc-java/issues/11131)) ([`c31dbf4`](https://togithub.com/grpc/grpc-java/commit/c31dbf48a)) - binder: Add a connection timeout ([#​11255](https://togithub.com/grpc/grpc-java/issues/11255)) ([`791f894`](https://togithub.com/grpc/grpc-java/commit/791f894e2)) ##### Bug fixes - core: Exit idle mode when delayed transport is in use ([`fea577c`](https://togithub.com/grpc/grpc-java/commit/fea577c80)). This was a long-standing race that could cause RPCs to hang, but was very unlikely to be hit. Avoiding the double-picking ([`8844cf7`](https://togithub.com/grpc/grpc-java/commit/8844cf7b8)) made the race more visible - netty: Fix Netty composite buffer merging to be compatible with Netty 4.1.111 ([#​11294](https://togithub.com/grpc/grpc-java/issues/11294)) ([`0fea7dd`](https://togithub.com/grpc/grpc-java/commit/0fea7dd)). The previous behavior easily caused data corruption - okhttp: Workaround SSLSocket not noticing socket is closed ([`a28357e`](https://togithub.com/grpc/grpc-java/commit/a28357e19)). Previously, shutting down when a new connection was being established could result in the server never becoming terminated - inprocess: Fix listener race if transport is shutdown while starting ([`e4e7f3a`](https://togithub.com/grpc/grpc-java/commit/e4e7f3a06)). This issue was unlikely to be hit outside of specialized tests - services: restore //services:binarylog bazel target ([#​11292](https://togithub.com/grpc/grpc-java/issues/11292)) ([`d57f271`](https://togithub.com/grpc/grpc-java/commit/d57f271)). This fixes a regression introduced in 1.62.2 - binder: Wait for all server transports to terminate before returning the security policy executor to the object pool ([#​11240](https://togithub.com/grpc/grpc-java/issues/11240)) ([`34ee600`](https://togithub.com/grpc/grpc-java/commit/34ee600dc)) - binder: Reject further SETUP_TRANSPORT requests post-BinderServer shutdown ([#​11260](https://togithub.com/grpc/grpc-java/issues/11260)) ([`1670e97`](https://togithub.com/grpc/grpc-java/commit/1670e97f7)) - bazel: Include missing com_google_protobuf_javalite in MODULE.bazel ([#​11147](https://togithub.com/grpc/grpc-java/issues/11147)) ([`f995c12`](https://togithub.com/grpc/grpc-java/commit/f995c121e)) ##### Thanks to [@​hakusai22](https://togithub.com/hakusai22) [@​firov](https://togithub.com/firov) [@​mateusazis](https://togithub.com/mateusazis) [@​Mir3605](https://togithub.com/Mir3605) [@​niloc132](https://togithub.com/niloc132) ### [`v1.64.1`](https://togithub.com/grpc/grpc-java/releases/tag/v1.64.1) ##### What's Changed - netty:Fix Netty composite buffer merging to be compatible with Netty 4.1.111 (1.64.x backport) by [@​larry-safran](https://togithub.com/larry-safran) in [grpc/grpc-java#11303 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMyIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJhdXRvbWVyZ2UiXX0=-->
kodiakhq bot
pushed a commit
to cloudquery/plugin-sdk-java
that referenced
this pull request
Jul 1, 2024
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [io.grpc:grpc-inprocess](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-testing](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-services](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-stub](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | | [io.grpc:grpc-protobuf](https://togithub.com/grpc/grpc-java) | dependencies | minor | `1.64.0` -> `1.65.0` | --- ### Release Notes <details> <summary>grpc/grpc-java (io.grpc:grpc-inprocess)</summary> ### [`v1.65.0`](https://togithub.com/grpc/grpc-java/releases/tag/v1.65.0) grpc-netty in this release is compatible with Netty 4.1.111; it fixes the incompatibility that caused data corruption. grpc-netty-shaded is still using Netty 4.1.100. ##### New Features - New module grpc-gcp-csm-observability ([`df8cfe9`](https://togithub.com/grpc/grpc-java/commit/df8cfe9dd)) ##### Improvements - api: Add `ClientStreamTracer.inboundHeaders(Metadata)` ([`960012d`](https://togithub.com/grpc/grpc-java/commit/960012d76)). This is the same as the existing `inboundHeaders()`, but is provided the Metadata - api: Fix various typos in the documentation ([#​11144](https://togithub.com/grpc/grpc-java/issues/11144)) ([`6ec744f`](https://togithub.com/grpc/grpc-java/commit/6ec744f2a)) - core: When queuing RPCs, don’t request picks from the LB twice ([`8844cf7`](https://togithub.com/grpc/grpc-java/commit/8844cf7b8)). This could be viewed as a small performance optimization, but mainly reduces the amount of race-handling code - util: Improve AdvancedTlsX509KeyManager’s documentation, verification, and testing. ([#​11139](https://togithub.com/grpc/grpc-java/issues/11139)) ([`781b4c4`](https://togithub.com/grpc/grpc-java/commit/781b4c457)) This change shows `@ExperimentalApi` being removed, but it was re-added in [`3c97245`](https://togithub.com/grpc/grpc-java/commit/3c97245) before the release - examples: Fix broken command in reflection readme ([#​11131](https://togithub.com/grpc/grpc-java/issues/11131)) ([`c31dbf4`](https://togithub.com/grpc/grpc-java/commit/c31dbf48a)) - binder: Add a connection timeout ([#​11255](https://togithub.com/grpc/grpc-java/issues/11255)) ([`791f894`](https://togithub.com/grpc/grpc-java/commit/791f894e2)) ##### Bug fixes - core: Exit idle mode when delayed transport is in use ([`fea577c`](https://togithub.com/grpc/grpc-java/commit/fea577c80)). This was a long-standing race that could cause RPCs to hang, but was very unlikely to be hit. Avoiding the double-picking ([`8844cf7`](https://togithub.com/grpc/grpc-java/commit/8844cf7b8)) made the race more visible - netty: Fix Netty composite buffer merging to be compatible with Netty 4.1.111 ([#​11294](https://togithub.com/grpc/grpc-java/issues/11294)) ([`0fea7dd`](https://togithub.com/grpc/grpc-java/commit/0fea7dd)). The previous behavior easily caused data corruption - okhttp: Workaround SSLSocket not noticing socket is closed ([`a28357e`](https://togithub.com/grpc/grpc-java/commit/a28357e19)). Previously, shutting down when a new connection was being established could result in the server never becoming terminated - inprocess: Fix listener race if transport is shutdown while starting ([`e4e7f3a`](https://togithub.com/grpc/grpc-java/commit/e4e7f3a06)). This issue was unlikely to be hit outside of specialized tests - services: restore //services:binarylog bazel target ([#​11292](https://togithub.com/grpc/grpc-java/issues/11292)) ([`d57f271`](https://togithub.com/grpc/grpc-java/commit/d57f271)). This fixes a regression introduced in 1.62.2 - binder: Wait for all server transports to terminate before returning the security policy executor to the object pool ([#​11240](https://togithub.com/grpc/grpc-java/issues/11240)) ([`34ee600`](https://togithub.com/grpc/grpc-java/commit/34ee600dc)) - binder: Reject further SETUP_TRANSPORT requests post-BinderServer shutdown ([#​11260](https://togithub.com/grpc/grpc-java/issues/11260)) ([`1670e97`](https://togithub.com/grpc/grpc-java/commit/1670e97f7)) - bazel: Include missing com_google_protobuf_javalite in MODULE.bazel ([#​11147](https://togithub.com/grpc/grpc-java/issues/11147)) ([`f995c12`](https://togithub.com/grpc/grpc-java/commit/f995c121e)) ##### Thanks to [@​hakusai22](https://togithub.com/hakusai22) [@​firov](https://togithub.com/firov) [@​mateusazis](https://togithub.com/mateusazis) [@​Mir3605](https://togithub.com/Mir3605) [@​niloc132](https://togithub.com/niloc132) ### [`v1.64.1`](https://togithub.com/grpc/grpc-java/releases/tag/v1.64.1) ##### What's Changed - netty:Fix Netty composite buffer merging to be compatible with Netty 4.1.111 (1.64.x backport) by [@​larry-safran](https://togithub.com/larry-safran) in [grpc/grpc-java#11303 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMyIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJhdXRvbWVyZ2UiXX0=-->
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.
Change the logic for identifying changes to the read index when merging into a netty composite buffer so that it works with both older versions of netty and netty 4.1.111
Fixes #11284
Backport of #11294