Introduce ValidateMemberVersions

Signed-off-by: Chun-Hung Tseng <[email protected]>

Author: henrybear327

tests/e2e/cluster_downgrade_test.go

@@ -133,13 +133,18 @@ func testDowngradeUpgrade(t *testing.T, clusterSize int, triggerSnapshot bool, t
 
 	if triggerCancellation == cancelRightBeforeEnable {
 		t.Logf("Cancelling downgrade before enabling")
-		e2e.DowngradeCancel(t, epc, generateIdenticalVersions(clusterSize, currentVersionStr))
+		e2e.DowngradeCancel(t, epc)
+		t.Log("Downgrade cancelled, validating if cluster is in the right state")
+		e2e.ValidateMemberVersions(t, epc, generateIdenticalVersions(clusterSize, currentVersionStr))
+
 		return // No need to perform downgrading, end the test here
 	}
 	e2e.DowngradeEnable(t, epc, lastVersion)
 	if triggerCancellation == cancelRightAfterEnable {
 		t.Logf("Cancelling downgrade right after enabling (no node is downgraded yet)")
-		e2e.DowngradeCancel(t, epc, generateIdenticalVersions(clusterSize, currentVersionStr))
+		e2e.DowngradeCancel(t, epc)
+		t.Log("Downgrade cancelled, validating if cluster is in the right state")
+		e2e.ValidateMemberVersions(t, epc, generateIdenticalVersions(clusterSize, currentVersionStr))
 		return // No need to perform downgrading, end the test here
 	}
 

tests/framework/e2e/downgrade.go

@@ -53,23 +53,14 @@ func DowngradeEnable(t *testing.T, epc *EtcdProcessCluster, ver *semver.Version)
 	t.Log("Cluster is ready for downgrade")
 }
 
-func DowngradeCancel(t *testing.T, epc *EtcdProcessCluster, versions []*version.Versions) {
+func DowngradeCancel(t *testing.T, epc *EtcdProcessCluster) {
 	t.Logf("etcdctl downgrade cancel")
 	c := epc.Etcdctl()
 	testutils.ExecuteWithTimeout(t, 20*time.Second, func() {
 		err := c.DowngradeCancel(context.TODO())
 		require.NoError(t, err)
 	})
 
-	t.Log("Downgrade cancelled, validating if cluster is in the right state")
-	for i := 0; i < len(epc.Procs); i++ {
-		ValidateVersion(t, epc.Cfg, epc.Procs[i], version.Versions{
-			Cluster: versions[i].Cluster,
-			Server:  versions[i].Server,
-			Storage: versions[i].Storage,
-		})
-	}
-
 	t.Log("Cluster downgrade cancellation is completed")
 }
 
@@ -124,6 +115,13 @@ func DowngradeUpgradeMembers(t *testing.T, lg *zap.Logger, clus *EtcdProcessClus
 	return nil
 }
 
+func ValidateMemberVersions(t *testing.T, epc *EtcdProcessCluster, expect []*version.Versions) {
+	for i := 0; i < len(epc.Procs); i++ {
+		ValidateVersion(t, epc.Cfg, epc.Procs[i], *expect[i])
+	}
+	t.Log("Cluster member version validation after downgrade cancellation is completed")
+}
+
 func ValidateVersion(t *testing.T, cfg *EtcdProcessClusterConfig, member EtcdProcess, expect version.Versions) {
 	testutils.ExecuteWithTimeout(t, 30*time.Second, func() {
 		for {