Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cluster/etcd/membership.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func Join(ctx context.Context, client *clientv3.Client, root string, self Member
}

for _, kv := range resp.Kvs {
if mem, err := decodeMember(kv.Value); err == nil {
if mem, err := decodeMember(kv.GetValue()); err == nil {
m.members[mem.ID] = mem
}
}
Expand All @@ -156,8 +156,8 @@ func Join(ctx context.Context, client *clientv3.Client, root string, self Member
m.cancel = cancel
m.wg.Add(2)

go m.keepAlive(bg) //nolint:contextcheck // lifetime-scoped, see above
go m.watch(bg, resp.Header.Revision+1) //nolint:contextcheck // lifetime-scoped, see above
go m.keepAlive(bg) //nolint:contextcheck // lifetime-scoped, see above
go m.watch(bg, resp.Header.GetRevision()+1) //nolint:contextcheck // lifetime-scoped, see above

return m, nil
}
Expand Down Expand Up @@ -249,14 +249,14 @@ func (m *Membership) watch(ctx context.Context, rev int64) {
for _, ev := range resp.Events {
switch ev.Type {
case clientv3.EventTypePut:
if mem, err := decodeMember(ev.Kv.Value); err == nil {
if mem, err := decodeMember(ev.Kv.GetValue()); err == nil {
m.set(mem)
changed = true
m.logger().Info("member joined",
zap.String("id", mem.ID), zap.String("zone", mem.Zone), zap.String("addr", mem.Addr))
}
case clientv3.EventTypeDelete:
id := strings.TrimPrefix(string(ev.Kv.Key), m.prefix)
id := strings.TrimPrefix(string(ev.Kv.GetKey()), m.prefix)
m.remove(id)
changed = true
m.logger().Info("member left", zap.String("id", id))
Expand Down
4 changes: 2 additions & 2 deletions cluster/etcd/ownership.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ func (o *Ownership) Acquire(ctx context.Context, shard string) (bool, error) {
}

// The key already exists: the claim is ours only if we wrote it.
kvs := resp.Responses[0].GetResponseRange().Kvs
kvs := resp.Responses[0].GetResponseRange().GetKvs()

return len(kvs) == 1 && string(kvs[0].Value) == o.id, nil
return len(kvs) == 1 && string(kvs[0].GetValue()) == o.id, nil
}

// Release relinquishes shard, but only if this node still holds the claim (a guarded delete,
Expand Down
2 changes: 1 addition & 1 deletion cluster/etcd/ownership_chaos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func readClaims(t *testing.T, client *clientv3.Client, shards []string) map[stri
require.NoError(t, err)

if len(resp.Kvs) == 1 {
out[s] = string(resp.Kvs[0].Value)
out[s] = string(resp.Kvs[0].GetValue())
}
}

Expand Down
28 changes: 13 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/prometheus/prometheus v0.312.0
github.com/stretchr/testify v1.11.1
github.com/zeebo/xxh3 v1.1.0
go.etcd.io/etcd/client/v3 v3.6.13
go.etcd.io/etcd/server/v3 v3.6.12
go.etcd.io/etcd/client/v3 v3.7.0
go.etcd.io/etcd/server/v3 v3.7.0
go.opentelemetry.io/collector/pdata v1.62.0
go.opentelemetry.io/collector/pdata/pprofile v0.156.0
go.opentelemetry.io/otel v1.44.0
Expand Down Expand Up @@ -51,16 +51,14 @@ require (
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/hashicorp/go-version v1.9.0 // indirect
github.com/jonboulle/clockwork v0.5.0 // indirect
Expand All @@ -78,17 +76,17 @@ require (
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.4.3 // indirect
go.etcd.io/etcd/api/v3 v3.6.13 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.13 // indirect
go.etcd.io/etcd/pkg/v3 v3.6.12 // indirect
go.etcd.io/raft/v3 v3.6.0 // indirect
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
go.etcd.io/bbolt v1.5.0 // indirect
go.etcd.io/etcd/api/v3 v3.7.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.7.0 // indirect
go.etcd.io/etcd/pkg/v3 v3.7.0 // indirect
go.etcd.io/raft/v3 v3.7.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector/featuregate v1.62.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 // indirect
go.opentelemetry.io/otel/sdk v1.44.0 // indirect
Expand Down Expand Up @@ -116,7 +114,7 @@ require (
k8s.io/client-go v0.35.3 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
Expand Down
Loading
Loading