Skip to content

Commit

Permalink
Use single string to define a flag allowing for easier testing
Browse files Browse the repository at this point in the history 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
  • Loading branch information
@serathius
serathius committed Oct 12, 2023
1 parent 6d9a0a4 commit 6f63f4b
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 159 deletions.
50 changes: 25 additions & 25 deletions tests/framework/e2e/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ func (cfg *EtcdProcessClusterConfig) EtcdAllServerProcessConfigs(tb testing.TB)
func (cfg *EtcdProcessClusterConfig) SetInitialOrDiscovery(serverCfg *EtcdServerProcessConfig, initialCluster []string, initialClusterState string) {
if cfg.Discovery == "" && len(cfg.ServerConfig.DiscoveryCfg.Endpoints) == 0 {
serverCfg.InitialCluster = strings.Join(initialCluster, ",")
serverCfg.Args = append(serverCfg.Args, "--initial-cluster", serverCfg.InitialCluster)
serverCfg.Args = append(serverCfg.Args, "--initial-cluster-state", initialClusterState)
serverCfg.Args = append(serverCfg.Args, "--initial-cluster="+serverCfg.InitialCluster)
serverCfg.Args = append(serverCfg.Args, "--initial-cluster-state="+initialClusterState)
}

if len(cfg.ServerConfig.DiscoveryCfg.Endpoints) > 0 {
Expand Down Expand Up @@ -509,27 +509,27 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
}

args := []string{
"--name", name,
"--listen-client-urls", strings.Join(curls, ","),
"--advertise-client-urls", strings.Join(curls, ","),
"--listen-peer-urls", peerListenUrl.String(),
"--initial-advertise-peer-urls", peerAdvertiseUrl.String(),
"--initial-cluster-token", cfg.ServerConfig.InitialClusterToken,
"--name=" + name,
"--listen-client-urls=" + strings.Join(curls, ","),
"--advertise-client-urls=" + strings.Join(curls, ","),
"--listen-peer-urls=" + peerListenUrl.String(),
"--initial-advertise-peer-urls=" + peerAdvertiseUrl.String(),
"--initial-cluster-token=" + cfg.ServerConfig.InitialClusterToken,
"--data-dir", dataDirPath,
"--snapshot-count", fmt.Sprintf("%d", cfg.ServerConfig.SnapshotCount),
"--snapshot-count=" + fmt.Sprintf("%d", cfg.ServerConfig.SnapshotCount),
}
var clientHttpUrl string
if cfg.ClientHttpSeparate {
clientHttpUrl = clientURL(cfg.ClientScheme(), clientHttpPort, cfg.Client.ConnectionType)
args = append(args, "--listen-client-http-urls", clientHttpUrl)
args = append(args, "--listen-client-http-urls="+clientHttpUrl)
}

if cfg.ServerConfig.ForceNewCluster {
args = append(args, "--force-new-cluster")
}
if cfg.ServerConfig.QuotaBackendBytes > 0 {
args = append(args,
"--quota-backend-bytes", fmt.Sprintf("%d", cfg.ServerConfig.QuotaBackendBytes),
"--quota-backend-bytes="+fmt.Sprintf("%d", cfg.ServerConfig.QuotaBackendBytes),
)
}
if !cfg.ServerConfig.StrictReconfigCheck {
Expand All @@ -547,58 +547,58 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
Scheme: cfg.MetricsURLScheme,
Host: fmt.Sprintf("localhost:%d", metricsPort),
}).String()
args = append(args, "--listen-metrics-urls", murl)
args = append(args, "--listen-metrics-urls="+murl)
}

args = append(args, cfg.TlsArgs()...)

if cfg.ServerConfig.AuthToken != "" && cfg.ServerConfig.AuthToken != embed.DefaultAuthToken {
args = append(args, "--auth-token", cfg.ServerConfig.AuthToken)
args = append(args, "--auth-token="+cfg.ServerConfig.AuthToken)
}

if cfg.ServerConfig.V2Deprecation != "" && cfg.ServerConfig.V2Deprecation != config2.V2_DEPR_DEFAULT {
args = append(args, "--v2-deprecation", string(cfg.ServerConfig.V2Deprecation))
args = append(args, "--v2-deprecation="+string(cfg.ServerConfig.V2Deprecation))
}

if cfg.Discovery != "" {
args = append(args, "--discovery", cfg.Discovery)
args = append(args, "--discovery="+cfg.Discovery)
}

if cfg.ServerConfig.LogLevel != "" && cfg.ServerConfig.LogLevel != logutil.DefaultLogLevel {
args = append(args, "--log-level", cfg.ServerConfig.LogLevel)
args = append(args, "--log-level="+cfg.ServerConfig.LogLevel)
}

if cfg.ServerConfig.MaxConcurrentStreams != 0 && cfg.ServerConfig.MaxConcurrentStreams != embed.DefaultMaxConcurrentStreams {
args = append(args, "--max-concurrent-streams", fmt.Sprintf("%d", cfg.ServerConfig.MaxConcurrentStreams))
args = append(args, "--max-concurrent-streams="+fmt.Sprintf("%d", cfg.ServerConfig.MaxConcurrentStreams))
}

if cfg.ServerConfig.ExperimentalCorruptCheckTime != 0 {
args = append(args, "--experimental-corrupt-check-time", fmt.Sprintf("%s", cfg.ServerConfig.ExperimentalCorruptCheckTime))
args = append(args, "--experimental-corrupt-check-time="+fmt.Sprintf("%s", cfg.ServerConfig.ExperimentalCorruptCheckTime))
}
if cfg.ServerConfig.ExperimentalCompactHashCheckEnabled {
args = append(args, "--experimental-compact-hash-check-enabled")
}
if cfg.ServerConfig.ExperimentalCompactHashCheckTime != 0 && cfg.ServerConfig.ExperimentalCompactHashCheckTime != embed.DefaultExperimentalCompactHashCheckTime {
args = append(args, "--experimental-compact-hash-check-time", cfg.ServerConfig.ExperimentalCompactHashCheckTime.String())
args = append(args, "--experimental-compact-hash-check-time="+cfg.ServerConfig.ExperimentalCompactHashCheckTime.String())
}
if cfg.ServerConfig.ExperimentalCompactionBatchLimit != 0 {
args = append(args, "--experimental-compaction-batch-limit", fmt.Sprintf("%d", cfg.ServerConfig.ExperimentalCompactionBatchLimit))
args = append(args, "--experimental-compaction-batch-limit="+fmt.Sprintf("%d", cfg.ServerConfig.ExperimentalCompactionBatchLimit))
}
if cfg.ServerConfig.ExperimentalCompactionSleepInterval != 0 {
args = append(args, "--experimental-compaction-sleep-interval", cfg.ServerConfig.ExperimentalCompactionSleepInterval.String())
args = append(args, "--experimental-compaction-sleep-interval="+cfg.ServerConfig.ExperimentalCompactionSleepInterval.String())
}
if cfg.ServerConfig.WarningUnaryRequestDuration != 0 {
args = append(args, "--warning-unary-request-duration", cfg.ServerConfig.WarningUnaryRequestDuration.String())
args = append(args, "--warning-unary-request-duration="+cfg.ServerConfig.WarningUnaryRequestDuration.String())
}
if cfg.ServerConfig.ExperimentalWarningUnaryRequestDuration != 0 {
args = append(args, "--experimental-warning-unary-request-duration", cfg.ServerConfig.ExperimentalWarningUnaryRequestDuration.String())
args = append(args, "--experimental-warning-unary-request-duration="+cfg.ServerConfig.ExperimentalWarningUnaryRequestDuration.String())
}
if cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0 {
args = append(args, "--experimental-watch-progress-notify-interval", cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval.String())
args = append(args, "--experimental-watch-progress-notify-interval="+cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval.String())
}
if cfg.ServerConfig.SnapshotCatchUpEntries != 0 && cfg.ServerConfig.SnapshotCatchUpEntries != etcdserver.DefaultSnapshotCatchUpEntries {
if cfg.Version == CurrentVersion || (cfg.Version == MinorityLastVersion && i <= cfg.ClusterSize/2) || (cfg.Version == QuorumLastVersion && i > cfg.ClusterSize/2) {
args = append(args, "--experimental-snapshot-catchup-entries", fmt.Sprintf("%d", cfg.ServerConfig.SnapshotCatchUpEntries))
args = append(args, "--experimental-snapshot-catchup-entries="+fmt.Sprintf("%d", cfg.ServerConfig.SnapshotCatchUpEntries))
}
}
envVars := map[string]string{}
Expand Down
201 changes: 67 additions & 134 deletions tests/framework/e2e/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,184 +30,117 @@ func TestEtcdServerProcessConfig(t *testing.T) {
name: "Default",
config: NewConfig(),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigDefault-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--name=TestEtcdServerProcessConfigDefault-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
},
},
{
name: "SnapshotCount",
config: NewConfig(WithSnapshotCount(42)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigSnapshotCount-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"42",
"--name=TestEtcdServerProcessConfigSnapshotCount-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=42",
},
},
{
name: "SnapshotCatchUpEntries",
config: NewConfig(WithSnapshotCatchUpEntries(12)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigSnapshotCatchUpEntries-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--experimental-snapshot-catchup-entries",
"12",
"--name=TestEtcdServerProcessConfigSnapshotCatchUpEntries-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
"--experimental-snapshot-catchup-entries=12",
},
},
{
name: "QuotaBackendBytes",
config: NewConfig(WithQuotaBackendBytes(123)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigQuotaBackendBytes-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--quota-backend-bytes",
"123",
"--name=TestEtcdServerProcessConfigQuotaBackendBytes-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
"--quota-backend-bytes=123",
},
},
{
name: "CorruptCheck",
config: NewConfig(WithInitialCorruptCheck(true)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigCorruptCheck-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--name=TestEtcdServerProcessConfigCorruptCheck-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
"--experimental-initial-corrupt-check",
},
},
{
name: "StrictReconfigCheck",
config: NewConfig(WithStrictReconfigCheck(false)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigStrictReconfigCheck-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--name=TestEtcdServerProcessConfigStrictReconfigCheck-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
"--strict-reconfig-check=false",
},
},
{
name: "CatchUpEntries",
config: NewConfig(WithSnapshotCatchUpEntries(100)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigCatchUpEntries-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--experimental-snapshot-catchup-entries",
"100",
"--name=TestEtcdServerProcessConfigCatchUpEntries-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
"--experimental-snapshot-catchup-entries=100",
},
},
{
name: "CatchUpEntriesLastVersion",
config: NewConfig(WithSnapshotCatchUpEntries(100), WithVersion(LastVersion)),
expectArgs: []string{
"--name",
"TestEtcdServerProcessConfigCatchUpEntriesLastVersion-test-0",
"--listen-client-urls",
"http://localhost:0",
"--advertise-client-urls",
"http://localhost:0",
"--listen-peer-urls",
"http://localhost:1",
"--initial-advertise-peer-urls",
"http://localhost:1",
"--initial-cluster-token",
"new",
"--data-dir",
"/tmp/fake/member-0",
"--snapshot-count",
"10000",
"--name=TestEtcdServerProcessConfigCatchUpEntriesLastVersion-test-0",
"--listen-client-urls=http://localhost:0",
"--advertise-client-urls=http://localhost:0",
"--listen-peer-urls=http://localhost:1",
"--initial-advertise-peer-urls=http://localhost:1",
"--initial-cluster-token=new",
"--data-dir=/tmp/fake/member-0",
"--snapshot-count=10000",
},
},
}
Expand Down

0 comments on commit 6f63f4b

Please sign in to comment.