Merge pull request etcd-io#16674 from serathius/reuse-embed-config

Reuse embed.Config in e2e cluster config

tests/e2e/corrupt_test.go

@@ -40,7 +40,7 @@ func TestEtcdCorruptHash(t *testing.T) {
 	cfg := e2e.NewConfigNoTLS()
 
 	// trigger snapshot so that restart member can load peers from disk
-	cfg.SnapshotCount = 3
+	cfg.ServerConfig.SnapshotCount = 3
 
 	testCtl(t, corruptTest, withQuorum(),
 		withCfg(*cfg),

tests/e2e/ctl_v3_test.go

@@ -190,13 +190,13 @@ func withFlagByEnv() ctlOption {
 // may be overwritten by `withCfg`.
 func withMaxConcurrentStreams(streams uint32) ctlOption {
 	return func(cx *ctlCtx) {
-		cx.cfg.MaxConcurrentStreams = streams
+		cx.cfg.ServerConfig.MaxConcurrentStreams = streams
 	}
 }
 
 func withLogLevel(logLevel string) ctlOption {
 	return func(cx *ctlCtx) {
-		cx.cfg.LogLevel = logLevel
+		cx.cfg.ServerConfig.LogLevel = logLevel
 	}
 }
 
@@ -221,9 +221,9 @@ func testCtlWithOffline(t *testing.T, testFunc func(ctlCtx), testOfflineFunc fun
 	if !ret.quorum {
 		ret.cfg = *e2e.ConfigStandalone(ret.cfg)
 	}
-	ret.cfg.StrictReconfigCheck = !ret.disableStrictReconfigCheck
+	ret.cfg.ServerConfig.StrictReconfigCheck = !ret.disableStrictReconfigCheck
 	if ret.initialCorruptCheck {
-		ret.cfg.InitialCorruptCheck = ret.initialCorruptCheck
+		ret.cfg.ServerConfig.ExperimentalInitialCorruptCheck = ret.initialCorruptCheck
 	}
 	if testOfflineFunc != nil {
 		ret.cfg.KeepDataDir = true

tests/e2e/etcd_mix_versions_test.go

@@ -90,7 +90,7 @@ func mixVersionsSnapshotTestByAddingMember(t *testing.T, clusterVersion, newInst
 	// start a new etcd instance, which will receive a snapshot from the leader.
 	newCfg := *epc.Cfg
 	newCfg.Version = newInstanceVersion
-	newCfg.SnapshotCatchUpEntries = 10
+	newCfg.ServerConfig.SnapshotCatchUpEntries = 10
 	t.Log("Starting a new etcd instance")
 	_, err = epc.StartNewProc(context.TODO(), &newCfg, t, false /* addAsLearner */)
 	require.NoError(t, err, "failed to start the new etcd instance: %v", err)

tests/e2e/v3_cipher_suite_test.go

@@ -32,7 +32,7 @@ func TestCurlV3CipherSuitesMismatch(t *testing.T) { testCurlV3CipherSuites(t, fa
 func testCurlV3CipherSuites(t *testing.T, valid bool) {
 	cc := e2e.NewConfigClientTLS()
 	cc.ClusterSize = 1
-	cc.CipherSuites = []string{
+	cc.ServerConfig.CipherSuites = []string{
 		"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
 		"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
 		"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",

tests/e2e/v3_curl_maxstream_test.go

@@ -102,15 +102,15 @@ func testCurlV3MaxStream(t *testing.T, reachLimit bool, opts ...ctlOption) {
 	//	(a) generate ${concurrentNumber} concurrent watch streams;
 	//	(b) submit a range request.
 	var wg sync.WaitGroup
-	concurrentNumber := cx.cfg.MaxConcurrentStreams - 1
+	concurrentNumber := cx.cfg.ServerConfig.MaxConcurrentStreams - 1
 	expectedResponse := `"revision":"`
 	if reachLimit {
-		concurrentNumber = cx.cfg.MaxConcurrentStreams
+		concurrentNumber = cx.cfg.ServerConfig.MaxConcurrentStreams
 		expectedResponse = "Operation timed out"
 	}
 	wg.Add(int(concurrentNumber))
 	t.Logf("Running the test, MaxConcurrentStreams: %d, concurrentNumber: %d, expected range's response: %s\n",
-		cx.cfg.MaxConcurrentStreams, concurrentNumber, expectedResponse)
+		cx.cfg.ServerConfig.MaxConcurrentStreams, concurrentNumber, expectedResponse)
 
 	closeServerCh := make(chan struct{})
 	submitConcurrentWatch(cx, int(concurrentNumber), &wg, closeServerCh)

tests/e2e/watch_delay_test.go

@@ -84,7 +84,7 @@ func TestWatchDelayForPeriodicProgressNotification(t *testing.T) {
 	e2e.BeforeTest(t)
 	for _, tc := range tcs {
 		tc := tc
-		tc.config.WatchProcessNotifyInterval = watchResponsePeriod
+		tc.config.ServerConfig.ExperimentalWatchProgressNotifyInterval = watchResponsePeriod
 		t.Run(tc.name, func(t *testing.T) {
 			clus, err := e2e.NewEtcdProcessCluster(context.Background(), t, e2e.WithConfig(&tc.config))
 			require.NoError(t, err)