From f5b59ee1980f40f36038183b581fbf0799db1b70 Mon Sep 17 00:00:00 2001 From: JordanRushing Date: Tue, 26 Jul 2022 10:52:48 -0500 Subject: [PATCH] Backport Memberlist dependency version bump to k108 Signed-off-by: JordanRushing --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/hashicorp/memberlist/queue.go | 6 ------ vendor/modules.txt | 4 ++-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 62d1ee0f5b921..abfc13d6b073b 100644 --- a/go.mod +++ b/go.mod @@ -336,4 +336,4 @@ replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0. // Replace memberlist with our fork which includes some fixes that haven't been // merged upstream yet. -replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 +replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe diff --git a/go.sum b/go.sum index 5e524358b72ed..9b04a5c62868b 100644 --- a/go.sum +++ b/go.sum @@ -858,8 +858,8 @@ github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/I github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85/go.mod h1:crI9WX6p0IhrqB+DqIUHulRW853PaNFf7o4UprV//3I= github.com/grafana/groupcache_exporter v0.0.0-20220629095919-59a8c6428a43 h1:yOw0zAMMp/GXp6eQ2hc5c9w6RcZ44u+QeyNeeAVoV7w= github.com/grafana/groupcache_exporter v0.0.0-20220629095919-59a8c6428a43/go.mod h1:hgtvYpo9DY0PnOJHQTlV12Uecz0jbDK/o0L9Vz4WvLs= -github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 h1:/NipyHnOmvRsVzj81j2qE0VxsvsqhOB0f4vJIhk2qCQ= -github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU= +github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb h1:wwzNkyaQwcXCzQuKoWz3lwngetmcyg+EhW0fF5lz73M= github.com/grafana/regexp v0.0.0-20220304100321-149c8afcd6cb/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= diff --git a/vendor/github.com/hashicorp/memberlist/queue.go b/vendor/github.com/hashicorp/memberlist/queue.go index c970176e18fda..2eb33c5444d87 100644 --- a/vendor/github.com/hashicorp/memberlist/queue.go +++ b/vendor/github.com/hashicorp/memberlist/queue.go @@ -248,12 +248,6 @@ func (q *TransmitLimitedQueue) deleteItem(cur *limitedBroadcast) { if cur.name != "" { delete(q.tm, cur.name) } - - if q.tq.Len() == 0 { - // At idle there's no reason to let the id generator keep going - // indefinitely. - q.idGen = 0 - } } // addItem adds the given item into the overall datastructure. You must already diff --git a/vendor/modules.txt b/vendor/modules.txt index 2d755367fcf2e..6e467e546e8c3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -614,7 +614,7 @@ github.com/hashicorp/go-uuid ## explicit; go 1.12 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru -# github.com/hashicorp/memberlist v0.3.1 => github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 +# github.com/hashicorp/memberlist v0.3.1 => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe ## explicit; go 1.12 github.com/hashicorp/memberlist # github.com/hashicorp/serf v0.9.6 @@ -1735,4 +1735,4 @@ sigs.k8s.io/yaml # k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 # google.golang.org/grpc => google.golang.org/grpc v1.45.0 # github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.36.2-0.20220613200027-59727ab0eb48 -# github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 +# github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe