Backport of Allow dialer to re-establish terminated peering into release/1.15.x#16859
Merged
hc-github-team-consul-core merged 2 commits intoApr 3, 2023
Conversation
hc-github-team-consul-core
force-pushed
the
backport/peering/re-establish-terminated/humbly-hardy-mole
branch
from
3825697 to
118ef79
Compare
hc-github-team-consul-core
force-pushed
the
backport/peering/re-establish-terminated/humbly-hardy-mole
branch
from
aff9c57 to
3d83a92
Compare
github-team-consul-core-pr-approver
approved these changes
Apr 3, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
hc-github-team-consul-core
deleted the
backport/peering/re-establish-terminated/humbly-hardy-mole
branch
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
3 participants
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 #16776 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
Currently, if an acceptor peer deletes a peering the dialer's peering will eventually get to a "terminated" state. If the two clusters need to be re-peered the acceptor will re-generate the token but the dialer will encounter this error on the call to establish:
This is because in
exchangeSecret().GetDialAddresses()we will get an error if fetching addresses for an inactive peering. The peering shows up as inactive at this point because of the existing terminated state.Rather than checking whether a peering is active we can instead check whether it was deleted. This way users do not need to delete terminated peerings in the dialing cluster before re-establishing them.
Testing & Reproduction steps
TestLeader_PeeringSync_Lifecycle_ServerDeletiontest updated below shows how to reproduce the issue. It fails without this update.PR Checklist
Overview of commits