Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of various version/requirements checking fixes #7551

Merged
merged 1 commit into from
Apr 14, 2020

Conversation

mkeeler
Copy link
Member

@mkeeler mkeeler commented Mar 31, 2020

Previously when checking for ACL modes or versions of servers we would give the various utility functions a list of Serf members to iterate through, pull out the servers and run the checks against. This worked okay when we only have to care about LAN and WAN serf instances but for enterprise we have other Serf instances.

The changes in this PR are just the OSS side of things but change things up to go through the router/server lookup infrastructure which tracks server metadata coming from multiple sources.

This also happens to fix a bug with ACL replication that would always start new ACL replication routines even when still in legacy ACL mode causing lots of errors in the logs.

These same changes already exist in master and the 1.7 release branch. This just backports those changes to the 1.6.x release branch.

@mkeeler mkeeler requested a review from a team March 31, 2020 15:28
Copy link
Member

@hanshasselberg hanshasselberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Previously when checking for ACL modes or versions of servers we would give the various utility functions a list of Serf members to iterate through, pull out the servers and run the checks against. This worked okay when we only have to care about LAN and WAN serf instances but for enterprise we have other Serf instances.

The changes in this PR are just the OSS side of things but change things up to go through the router/server lookup infrastructure which tracks server metadata coming from multiple sources.

This also happens to fix a bug with ACL replication that would always start new ACL replication routines even when still in legacy ACL mode causing lots of errors in the logs.
@mkeeler mkeeler force-pushed the backport/gossip-feature-advertisement branch from 3ef5f43 to 6d0a823 Compare April 14, 2020 14:12
@mkeeler mkeeler merged commit e639ede into release/1.6.x Apr 14, 2020
@mkeeler mkeeler deleted the backport/gossip-feature-advertisement branch April 14, 2020 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants