version: 3.5.0-beta.2

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>

.github/workflows/self-hosted-linux-arm64-graviton2-tests.yml

@@ -1,10 +1,5 @@
 name: Linux ARM64 Graviton2
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+on: [push, pull_request]
 
 jobs:
   test:

api/version/version.go

@@ -26,7 +26,7 @@ import (
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
 	MinClusterVersion = "3.0.0"
-	Version           = "3.5.0-beta.0"
+	Version           = "3.5.0-beta.2"
 	APIVersion        = "unknown"
 
 	// Git SHA Value will be set during build

client/v2/go.mod

@@ -5,8 +5,8 @@ go 1.16
 require (
 	github.com/json-iterator/go v1.1.10
 	github.com/modern-go/reflect2 v1.0.1
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
 )
 
 replace (

client/v3/go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/prometheus/client_golang v1.5.1
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	google.golang.org/grpc v1.37.0
 	sigs.k8s.io/yaml v1.2.0

etcdctl/go.mod

@@ -9,12 +9,12 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/urfave/cli v1.22.4
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/v2 v2.305.0-alpha.0
-	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.37.0

etcdutl/go.mod

@@ -25,11 +25,11 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/server/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 )

go.mod

@@ -20,16 +20,16 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/v2 v2.305.0-alpha.0
-	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/etcdctl/v3 v3.0.0-00010101000000-000000000000
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/server/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/etcdctl/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/tests/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.37.0

pkg/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	google.golang.org/grpc v1.37.0
 )

raft/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
 	github.com/pkg/errors v0.9.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
 )
 
 // Bad imports are sometimes causing attempts to pull that code.

server/etcdserver/apply_v2.go

@@ -21,7 +21,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/coreos/go-semver/semver"
 	"go.etcd.io/etcd/pkg/v3/pbutil"
+	"go.etcd.io/etcd/server/v3/etcdserver/api"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/membership"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
 
@@ -92,9 +94,12 @@ func (a *applierV2store) Put(r *RequestV2) Response {
 			// return an empty response since there is no consumer.
 			return Response{}
 		}
-		// remove v2 version set to avoid the conflict between v2 and v3.
+		// TODO remove v2 version set to avoid the conflict between v2 and v3 in etcd 3.6
 		if r.Path == membership.StoreClusterVersionKey() {
-			// return an empty response since there is no consumer.
+			if a.cluster != nil {
+				// persist to backend given v2store can be very stale
+				a.cluster.SetVersion(semver.Must(semver.NewVersion(r.Val)), api.UpdateCapability, membership.ApplyBoth)
+			}
 			return Response{}
 		}
 		return toResponse(a.store.Set(r.Path, r.Dir, r.Val, ttlOptions))

server/etcdserver/server.go

@@ -2428,6 +2428,7 @@ func (s *EtcdServer) ClusterVersion() *semver.Version {
 // It updates the cluster version if all members agrees on a higher one.
 // It prints out log if there is a member with a higher version than the
 // local version.
+// TODO switch to updateClusterVersionV3 in 3.6
 func (s *EtcdServer) monitorVersions() {
 	for {
 		select {
@@ -2458,27 +2459,67 @@ func (s *EtcdServer) monitorVersions() {
 			if v != nil {
 				verStr = v.String()
 			}
-			s.GoAttach(func() { s.updateClusterVersion(verStr) })
+			s.GoAttach(func() { s.updateClusterVersionV2(verStr) })
 			continue
 		}
 
 		if v != nil && membership.IsValidVersionChange(s.cluster.Version(), v) {
-			s.GoAttach(func() { s.updateClusterVersion(v.String()) })
+			s.GoAttach(func() { s.updateClusterVersionV2(v.String()) })
 		}
 	}
 }
 
-func (s *EtcdServer) updateClusterVersion(ver string) {
+func (s *EtcdServer) updateClusterVersionV2(ver string) {
 	lg := s.Logger()
 
 	if s.cluster.Version() == nil {
 		lg.Info(
-			"setting up initial cluster version",
+			"setting up initial cluster version using v2 API",
 			zap.String("cluster-version", version.Cluster(ver)),
 		)
 	} else {
 		lg.Info(
-			"updating cluster version",
+			"updating cluster version using v2 API",
+			zap.String("from", version.Cluster(s.cluster.Version().String())),
+			zap.String("to", version.Cluster(ver)),
+		)
+	}
+
+	req := pb.Request{
+		Method: "PUT",
+		Path:   membership.StoreClusterVersionKey(),
+		Val:    ver,
+	}
+
+	ctx, cancel := context.WithTimeout(s.ctx, s.Cfg.ReqTimeout())
+	_, err := s.Do(ctx, req)
+	cancel()
+
+	switch err {
+	case nil:
+		lg.Info("cluster version is updated", zap.String("cluster-version", version.Cluster(ver)))
+		return
+
+	case ErrStopped:
+		lg.Warn("aborting cluster version update; server is stopped", zap.Error(err))
+		return
+
+	default:
+		lg.Warn("failed to update cluster version", zap.Error(err))
+	}
+}
+
+func (s *EtcdServer) updateClusterVersionV3(ver string) {
+	lg := s.Logger()
+
+	if s.cluster.Version() == nil {
+		lg.Info(
+			"setting up initial cluster version using v3 API",
+			zap.String("cluster-version", version.Cluster(ver)),
+		)
+	} else {
+		lg.Info(
+			"updating cluster version using v3 API",
 			zap.String("from", version.Cluster(s.cluster.Version().String())),
 			zap.String("to", version.Cluster(ver)),
 		)

server/etcdserver/server_test.go

@@ -22,6 +22,7 @@ import (
 	"math"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"reflect"
 	"sync"
@@ -1716,6 +1717,53 @@ func TestPublishV3Retry(t *testing.T) {
 	<-ch
 }
 
+func TestUpdateVersion(t *testing.T) {
+	n := newNodeRecorder()
+	ch := make(chan interface{}, 1)
+	// simulate that request has gone through consensus
+	ch <- Response{}
+	w := wait.NewWithResponse(ch)
+	ctx, cancel := context.WithCancel(context.TODO())
+	srv := &EtcdServer{
+		lgMu:       new(sync.RWMutex),
+		lg:         zap.NewExample(),
+		id:         1,
+		Cfg:        config.ServerConfig{Logger: zap.NewExample(), TickMs: 1, SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries},
+		r:          *newRaftNode(raftNodeConfig{lg: zap.NewExample(), Node: n}),
+		attributes: membership.Attributes{Name: "node1", ClientURLs: []string{"http://node1.com"}},
+		cluster:    &membership.RaftCluster{},
+		w:          w,
+		reqIDGen:   idutil.NewGenerator(0, time.Time{}),
+		SyncTicker: &time.Ticker{},
+
+		ctx:    ctx,
+		cancel: cancel,
+	}
+	srv.updateClusterVersionV2("2.0.0")
+
+	action := n.Action()
+	if len(action) != 1 {
+		t.Fatalf("len(action) = %d, want 1", len(action))
+	}
+	if action[0].Name != "Propose" {
+		t.Fatalf("action = %s, want Propose", action[0].Name)
+	}
+	data := action[0].Params[0].([]byte)
+	var r pb.Request
+	if err := r.Unmarshal(data); err != nil {
+		t.Fatalf("unmarshal request error: %v", err)
+	}
+	if r.Method != "PUT" {
+		t.Errorf("method = %s, want PUT", r.Method)
+	}
+	if wpath := path.Join(StoreClusterPrefix, "version"); r.Path != wpath {
+		t.Errorf("path = %s, want %s", r.Path, wpath)
+	}
+	if r.Val != "2.0.0" {
+		t.Errorf("val = %s, want %s", r.Val, "2.0.0")
+	}
+}
+
 func TestStopNotify(t *testing.T) {
 	s := &EtcdServer{
 		lgMu: new(sync.RWMutex),

server/go.mod

@@ -27,12 +27,12 @@ require (
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/v2 v2.305.0-alpha.0
-	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
 	go.opentelemetry.io/otel v0.20.0
 	go.opentelemetry.io/otel/exporters/otlp v0.20.0

tests/go.mod

@@ -28,14 +28,14 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/client/v2 v2.305.0-alpha.0
-	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0
-	go.etcd.io/etcd/server/v3 v3.5.0-alpha.0
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9