Backport of fix: consume ignored entries in CE downgrade via Ent snapshot into release/1.18.x #20978
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
github-team-consul-core-pr-approver
approved these changes
Apr 11, 2024
zalimeni
approved these changes
Apr 12, 2024
zalimeni
deleted the
backport/zalimeni/ce-downgrade-ent-snap-restore-unsupported/nearly-primary-duckling
branch
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.
Backport
This PR is auto-generated from #20977 to be assessed for backporting due to the inclusion of the label backport/1.18.
The below text is copied from the body of the original PR.
Description
This operation would previously fail due to unconsumed bytes in the decoder buffer when reading the Ent snapshot (the first byte of the record would be misinterpreted as a type indicator, and the remaining bytes would fail to be deserialized or read as invalid data).
Ensure restore succeeds by decoding the ignored record as an
interface{}, which will consume the record bytes without requiring a concrete target struct, then moving on to the next record.Opened in response to a bug report by @sayap (thank you)
Testing & Reproduction steps
PR Checklist
Overview of commits