Skip to content

Update memberlist and dskit#13651

Merged
pracucci merged 1 commit intomainfrom
update-dskit
Nov 25, 2025
Merged

Update memberlist and dskit#13651
pracucci merged 1 commit intomainfrom
update-dskit

Conversation

@pracucci
Copy link
Collaborator

@pracucci pracucci commented Nov 25, 2025

What this PR does

Update memberlist and dskit to grafana/dskit#798 and grafana/memberlist#11.

Which issue(s) this PR fixes or relates to

N/A

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]. If changelog entry is not needed, please add the changelog-not-needed label to the PR.
  • about-versioning.md updated with experimental features.

Note

Updates dskit and memberlist to add configurable multi-node push/pull; bridges now push/pull with 2 nodes per interval (others with 1).

  • Memberlist (vendor fork):
    • Add Config.PushPullNodes with defaults set to 1 in DefaultLANConfig, DefaultWANConfig, and DefaultLocalConfig.
    • Update pushPull() to select N random live nodes and sync with each based on PushPullNodes.
  • dskit (vendor):
    • In vendor/github.com/grafana/dskit/kv/memberlist/memberlist_client.go, set mlCfg.PushPullNodes to 2 for NodeRoleBridge, otherwise 1.
  • Dependencies:
    • Bump github.com/grafana/dskit and replace github.com/hashicorp/memberlist with newer github.com/grafana/memberlist fork revisions.

Written by Cursor Bugbot for commit d2a441f. This will update automatically on new commits. Configure here.

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci added the changelog-not-needed PRs that don't need a CHANGELOG.md entry label Nov 25, 2025
@pracucci pracucci marked this pull request as ready for review November 25, 2025 16:03
@pracucci pracucci requested review from a team and stevesg as code owners November 25, 2025 16:03
@pracucci pracucci merged commit 961e585 into main Nov 25, 2025
41 checks passed
@pracucci pracucci deleted the update-dskit branch November 25, 2025 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-not-needed PRs that don't need a CHANGELOG.md entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants