[3.5] backport mix version e2e test.

tests/e2e/ctl_v3_test.go

@@ -50,13 +50,11 @@ func TestClusterVersion(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			binary := e2e.BinDir + "/etcd"
-			if !fileutil.Exist(binary) {
-				t.Skipf("%q does not exist", binary)
+			if !fileutil.Exist(e2e.BinPath) {
+				t.Skipf("%q does not exist", e2e.BinPath)
 			}
 			e2e.BeforeTest(t)
 			cfg := e2e.NewConfigNoTLS()
-			cfg.ExecPath = binary
 			cfg.SnapshotCount = 3
 			cfg.BasePeerScheme = "unix" // to avoid port conflict
 			cfg.RollingStart = tt.rollingStart

tests/e2e/etcd_mix_versions_test.go

@@ -0,0 +1,194 @@
+// Copyright 2024 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package e2e
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.etcd.io/etcd/client/pkg/v3/fileutil"
+	"go.etcd.io/etcd/tests/v3/framework/e2e"
+)
+
+type clusterTestCase struct {
+	name   string
+	config e2e.EtcdProcessClusterConfig
+}
+
+func clusterTestCases(size int) []clusterTestCase {
+	tcs := []clusterTestCase{
+		{
+			name:   "CurrentVersion",
+			config: e2e.EtcdProcessClusterConfig{ClusterSize: size},
+		},
+	}
+	if !fileutil.Exist(e2e.BinPathLastRelease) {
+		return tcs
+	}
+
+	tcs = append(tcs,
+		clusterTestCase{
+			name:   "LastVersion",
+			config: e2e.EtcdProcessClusterConfig{ClusterSize: size, Version: e2e.LastVersion},
+		},
+	)
+	if size > 2 {
+		tcs = append(tcs,
+			clusterTestCase{
+				name:   "MinorityLastVersion",
+				config: e2e.EtcdProcessClusterConfig{ClusterSize: size, Version: e2e.MinorityLastVersion},
+			}, clusterTestCase{
+				name:   "QuorumLastVersion",
+				config: e2e.EtcdProcessClusterConfig{ClusterSize: size, Version: e2e.QuorumLastVersion},
+			},
+		)
+	}
+	return tcs
+}
+
+// TestMixVersionsSnapshotByAddingMember tests the mix version send snapshots by adding member
+func TestMixVersionsSnapshotByAddingMember(t *testing.T) {
+	for _, tc := range clusterTestCases(1) {
+		t.Run(tc.name+"-adding-new-member-of-current-version", func(t *testing.T) {
+			mixVersionsSnapshotTestByAddingMember(t, tc.config, e2e.CurrentVersion)
+		})
+		// TODO: uncomment after v3.4.32 release.
+		// After v3.4.32, etcd can support adding a new member of 3.4 into
+		// a cluster with 3.5 if the 3.4 member is started with '--next-cluster-version-compatible'.
+
+		// t.Run(tc.name+"-adding-new-member-of-last-version", func(t *testing.T) {
+		// 	mixVersionsSnapshotTestByAddingMember(t, tc.config, e2e.LastVersion)
+		// })
+	}
+}
+
+func mixVersionsSnapshotTestByAddingMember(t *testing.T, cfg e2e.EtcdProcessClusterConfig, newInstanceVersion e2e.ClusterVersion) {
+	e2e.BeforeTest(t)
+
+	t.Logf("Create an etcd cluster with %d member\n", cfg.ClusterSize)
+	cfg.SnapshotCount = 10
+	cfg.BasePeerScheme = "unix" // to avoid port conflict
+
+	epc, err := e2e.NewEtcdProcessCluster(t, &cfg)
+
+	require.NoError(t, err, "failed to start etcd cluster: %v", err)
+	defer func() {
+		derr := epc.Close()
+		require.NoError(t, derr, "failed to close etcd cluster: %v", derr)
+	}()
+
+	t.Log("Writing 20 keys to the cluster (more than SnapshotCount entries to trigger at least a snapshot)")
+
+	etcdctl := epc.Procs[0].Etcdctl(e2e.ClientNonTLS, false, false)
+	writeKVs(t, etcdctl, 0, 20)
+
+	t.Log("Start a new etcd instance, which will receive a snapshot from the leader.")
+	newCfg := *epc.Cfg
+	newCfg.Version = newInstanceVersion
+	t.Log("Starting a new etcd instance")
+	_, err = epc.StartNewProc(&newCfg, t)
+	require.NoError(t, err, "failed to start the new etcd instance: %v", err)
+	defer epc.Close()
+
+	assertKVHash(t, epc)
+}
+
+func TestMixVersionsSnapshotByMockingPartition(t *testing.T) {
+	mockPartitionNodeIndex := 2
+	for _, tc := range clusterTestCases(3) {
+		t.Run(tc.name, func(t *testing.T) {
+			mixVersionsSnapshotTestByMockPartition(t, tc.config, mockPartitionNodeIndex)
+		})
+	}
+}
+
+func mixVersionsSnapshotTestByMockPartition(t *testing.T, cfg e2e.EtcdProcessClusterConfig, mockPartitionNodeIndex int) {
+	e2e.BeforeTest(t)
+
+	if !fileutil.Exist(e2e.BinPathLastRelease) {
+		t.Skipf("%q does not exist", e2e.BinPathLastRelease)
+	}
+
+	t.Logf("Create an etcd cluster with %d member\n", cfg.ClusterSize)
+	cfg.SnapshotCount = 10
+	cfg.BasePeerScheme = "unix" // to avoid port conflict
+
+	epc, err := e2e.NewEtcdProcessCluster(t, &cfg)
+	require.NoError(t, err, "failed to start etcd cluster: %v", err)
+	defer func() {
+		derr := epc.Close()
+		require.NoError(t, derr, "failed to close etcd cluster: %v", derr)
+	}()
+	toPartitionedMember := epc.Procs[mockPartitionNodeIndex]
+
+	t.Log("Stop and restart the partitioned member")
+	err = toPartitionedMember.Stop()
+	require.NoError(t, err)
+	time.Sleep(2 * time.Second)
+
+	t.Log("Writing 20 keys to the cluster (more than SnapshotCount entries to trigger at least a snapshot)")
+	etcdctl := epc.Procs[0].Etcdctl(e2e.ClientNonTLS, false, false)
+	writeKVs(t, etcdctl, 0, 20)
+
+	t.Log("Verify logs to check leader has saved snapshot")
+	leaderEPC := epc.Procs[epc.WaitLeader(t)]
+	e2e.AssertProcessLogs(t, leaderEPC, "saved snapshot")
+
+	t.Log("Restart the partitioned member")
+	err = toPartitionedMember.Restart()
+	require.NoError(t, err)
+
+	assertKVHash(t, epc)
+}
+
+func writeKVs(t *testing.T, etcdctl *e2e.Etcdctl, startIdx, endIdx int) {
+	for i := startIdx; i < endIdx; i++ {
+		key := fmt.Sprintf("key-%d", i)
+		value := fmt.Sprintf("value-%d", i)
+		err := etcdctl.Put(key, value)
+		require.NoError(t, err, "failed to put %q, error: %v", key, err)
+	}
+}
+
+func assertKVHash(t *testing.T, epc *e2e.EtcdProcessCluster) {
+	clusterSize := len(epc.Procs)
+	if clusterSize < 2 {
+		return
+	}
+	t.Log("Verify all nodes have exact same revision and hash")
+	assert.Eventually(t, func() bool {
+		hashKvs, err := epc.Etcdctl().HashKV(0)
+		if err != nil {
+			t.Logf("failed to get HashKV: %v", err)
+			return false
+		}
+		if len(hashKvs) != clusterSize {
+			t.Logf("expected %d hashkv responses, but got: %d", clusterSize, len(hashKvs))
+			return false
+		}
+		for i := 1; i < clusterSize; i++ {
+			if hashKvs[0].Header.Revision != hashKvs[i].Header.Revision {
+				t.Logf("Got different revisions, [%d, %d]", hashKvs[0].Header.Revision, hashKvs[1].Header.Revision)
+				return false
+			}
+
+			assert.Equal(t, hashKvs[0].Hash, hashKvs[i].Hash)
+		}
+		return true
+	}, 10*time.Second, 500*time.Millisecond)
+}

tests/e2e/etcd_release_upgrade_test.go

@@ -37,7 +37,7 @@ func TestReleaseUpgrade(t *testing.T) {
 	e2e.BeforeTest(t)
 
 	copiedCfg := e2e.NewConfigNoTLS()
-	copiedCfg.ExecPath = lastReleaseBinary
+	copiedCfg.Version = e2e.LastVersion
 	copiedCfg.SnapshotCount = 3
 	copiedCfg.BasePeerScheme = "unix" // to avoid port conflict
 
@@ -78,7 +78,7 @@ func TestReleaseUpgrade(t *testing.T) {
 			t.Fatalf("#%d: error closing etcd process (%v)", i, err)
 		}
 		t.Logf("Stopped node: %v", i)
-		epc.Procs[i].Config().ExecPath = e2e.BinDir + "/etcd"
+		epc.Procs[i].Config().ExecPath = e2e.BinPath
 		epc.Procs[i].Config().KeepDataDir = true
 
 		t.Logf("Restarting node in the new version: %v", i)
@@ -123,7 +123,7 @@ func TestReleaseUpgradeWithRestart(t *testing.T) {
 	e2e.BeforeTest(t)
 
 	copiedCfg := e2e.NewConfigNoTLS()
-	copiedCfg.ExecPath = lastReleaseBinary
+	copiedCfg.Version = e2e.LastVersion
 	copiedCfg.SnapshotCount = 10
 	copiedCfg.BasePeerScheme = "unix"
 
@@ -166,7 +166,7 @@ func TestReleaseUpgradeWithRestart(t *testing.T) {
 	wg.Add(len(epc.Procs))
 	for i := range epc.Procs {
 		go func(i int) {
-			epc.Procs[i].Config().ExecPath = e2e.BinDir + "/etcd"
+			epc.Procs[i].Config().ExecPath = e2e.BinPath
 			epc.Procs[i].Config().KeepDataDir = true
 			if err := epc.Procs[i].Restart(); err != nil {
 				t.Errorf("error restarting etcd process (%v)", err)