s2: Fix DecodeConcurrent deadlock on errors #925
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
When DecodeConcurrent encounters an error it can lock up in some cases. Fix and add fuzz test for stream decoding. Fixes #920
codeboten
referenced
this pull request
in open-telemetry/opentelemetry-collector
Feb 7, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | `v1.17.5` -> `v1.17.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (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 this update again. --- - [ ] <!-- 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/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNzMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE3My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <aboten@lightstep.com>
mx-psi
referenced
this pull request
in open-telemetry/opentelemetry-collector-contrib
Feb 9, 2024
…1060) [](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | `v1.17.5` -> `v1.17.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (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 this update again. --- - [ ] <!-- 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/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNzMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE3My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com>
kodiakhq bot
referenced
this pull request
in cloudquery/codegen
Mar 1, 2024
](https://renovatebot.com){kind=link}
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.7`](https://togithub.com/klauspost/compress/releases/tag/v1.17.7) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.6...v1.17.7) #### What's Changed - s2: Add AsyncFlush method: Complete the block without flushing by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://togithub.com/klauspost/compress/pull/927) - s2: Fix literal+repeat exceeds dst crash by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://togithub.com/klauspost/compress/pull/930) **Full Changelog**: klauspost/compress@v1.17.6...v1.17.7 ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </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 this update 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:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot
referenced
this pull request
in cloudquery/filetypes
Mar 1, 2024
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.7`](https://togithub.com/klauspost/compress/releases/tag/v1.17.7) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.6...v1.17.7) #### What's Changed - s2: Add AsyncFlush method: Complete the block without flushing by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://togithub.com/klauspost/compress/pull/927) - s2: Fix literal+repeat exceeds dst crash by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://togithub.com/klauspost/compress/pull/930) **Full Changelog**: klauspost/compress@v1.17.6...v1.17.7 ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </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 this update 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:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot
referenced
this pull request
in cloudquery/plugin-pb-go
Mar 1, 2024
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.7`](https://togithub.com/klauspost/compress/releases/tag/v1.17.7) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.6...v1.17.7) #### What's Changed - s2: Add AsyncFlush method: Complete the block without flushing by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://togithub.com/klauspost/compress/pull/927) - s2: Fix literal+repeat exceeds dst crash by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://togithub.com/klauspost/compress/pull/930) **Full Changelog**: klauspost/compress@v1.17.6...v1.17.7 ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </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 this update 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:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot
referenced
this pull request
in cloudquery/plugin-sdk
Mar 1, 2024
) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.7`](https://togithub.com/klauspost/compress/releases/tag/v1.17.7) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.6...v1.17.7) #### What's Changed - s2: Add AsyncFlush method: Complete the block without flushing by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://togithub.com/klauspost/compress/pull/927) - s2: Fix literal+repeat exceeds dst crash by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://togithub.com/klauspost/compress/pull/930) **Full Changelog**: klauspost/compress@v1.17.6...v1.17.7 ### [`v1.17.6`](https://togithub.com/klauspost/compress/releases/tag/v1.17.6) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.5...v1.17.6) #### What's Changed - zstd: Fix incorrect repeat coding in best mode by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://togithub.com/klauspost/compress/pull/923) - s2: Fix DecodeConcurrent deadlock on errors by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://togithub.com/klauspost/compress/pull/925) - build: Remove garble compiler by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://togithub.com/klauspost/compress/pull/924) **Full Changelog**: klauspost/compress@v1.17.5...v1.17.6 </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 this update 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:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
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.
When DecodeConcurrent encounters an error it can lock up in some cases.
Fix and add fuzz test for stream decoding.
Fixes #920