Backport of Fix up case where subscription is terminated due to ACLs changing or a snapshot restore occurring into release/1.15.x#17567
Merged
hc-github-team-consul-core merged 3 commits intorelease/1.15.xfrom Jun 5, 2023
Conversation
ddbd534 to
48389a8
Compare
5a2f7f7 to
adad503
Compare
github-team-consul-core-pr-approver
approved these changes
Jun 5, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
This file contains hidden or 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
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 #17566 to be assessed for backporting due to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
Description
Due to swallowing and only logging xDS errors here:
consul/agent/proxycfg/state.go
Lines 375 to 386 in 88951bf
We were getting into a state where if ACLs were modified while connected to xDS, the stream wasn't properly being re-established and instead the Consul logs were filling up with error logs such as:
Basically we were missing some casing for marking certain errors as
TerminalErrors in proxycfg-glue, this fixes that.Testing & Reproduction steps
Get a proxy and/or gateway to connect up to xDS and then modify the token ACLs that are associated with it, you should see a bunch of these in the logs.
PR Checklist
Overview of commits