Minor refacotr on the e2e test framework

Signed-off-by: Benjamin Wang <[email protected]>

Author: ahrtr

tests/framework/e2e/cluster.go

@@ -633,26 +633,13 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
 		args = append(args, "--discovery="+cfg.Discovery)
 	}
 
-	var execPath string
-	switch cfg.Version {
-	case CurrentVersion:
-		execPath = BinPath.Etcd
-	case MinorityLastVersion:
-		if i <= cfg.ClusterSize/2 {
-			execPath = BinPath.Etcd
-		} else {
-			execPath = BinPath.EtcdLastRelease
-		}
-	case QuorumLastVersion:
-		if i <= cfg.ClusterSize/2 {
-			execPath = BinPath.EtcdLastRelease
-		} else {
-			execPath = BinPath.Etcd
-		}
-	case LastVersion:
-		execPath = BinPath.EtcdLastRelease
-	default:
-		panic(fmt.Sprintf("Unknown cluster version %v", cfg.Version))
+	execPath := cfg.binaryPath(i)
+
+	if cfg.ServerConfig.SnapshotCatchUpEntries != etcdserver.DefaultSnapshotCatchUpEntries {
+		/*if !IsSnapshotCatchupEntriesFlagAvailable(execPath) {
+			cfg.ServerConfig.ExperimentalSnapshotCatchUpEntries = cfg.ServerConfig.SnapshotCatchUpEntries
+			cfg.ServerConfig.SnapshotCatchUpEntries = etcdserver.DefaultSnapshotCatchUpEntries
+		} */
 	}
 
 	defaultValues := values(*embed.NewConfig())
@@ -696,6 +683,32 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
 	}
 }
 
+func (cfg *EtcdProcessClusterConfig) binaryPath(i int) string {
+	var execPath string
+	switch cfg.Version {
+	case CurrentVersion:
+		execPath = BinPath.Etcd
+	case MinorityLastVersion:
+		if i <= cfg.ClusterSize/2 {
+			execPath = BinPath.Etcd
+		} else {
+			execPath = BinPath.EtcdLastRelease
+		}
+	case QuorumLastVersion:
+		if i <= cfg.ClusterSize/2 {
+			execPath = BinPath.EtcdLastRelease
+		} else {
+			execPath = BinPath.Etcd
+		}
+	case LastVersion:
+		execPath = BinPath.EtcdLastRelease
+	default:
+		panic(fmt.Sprintf("Unknown cluster version %v", cfg.Version))
+	}
+
+	return execPath
+}
+
 func values(cfg embed.Config) map[string]string {
 	fs := flag.NewFlagSet("etcd", flag.ContinueOnError)
 	cfg.AddFlags(fs)