Fix race condition in tests due to use of globals in configuration

Signed-off-by: Aleksander Mistewicz <[email protected]>

server/embed/config.go

@@ -598,6 +598,14 @@ func NewConfig() *Config {
 }
 
 func (cfg *Config) AddFlags(fs *flag.FlagSet) {
+	cfg.AddFlagsWithoutGlobals(fs)
+
+	// raft connection timeouts
+	fs.DurationVar(&rafthttp.ConnReadTimeout, "raft-read-timeout", rafthttp.DefaultConnReadTimeout, "Read timeout set on each rafthttp connection")
+	fs.DurationVar(&rafthttp.ConnWriteTimeout, "raft-write-timeout", rafthttp.DefaultConnWriteTimeout, "Write timeout set on each rafthttp connection")
+}
+
+func (cfg *Config) AddFlagsWithoutGlobals(fs *flag.FlagSet) {
 	// member
 	fs.StringVar(&cfg.Dir, "data-dir", cfg.Dir, "Path to the data directory.")
 	fs.StringVar(&cfg.WalDir, "wal-dir", cfg.WalDir, "Path to the dedicated wal directory.")
@@ -640,10 +648,6 @@ func (cfg *Config) AddFlags(fs *flag.FlagSet) {
 
 	fs.Var(flags.NewUint32Value(cfg.MaxConcurrentStreams), "max-concurrent-streams", "Maximum concurrent streams that each client can open at a time.")
 
-	// raft connection timeouts
-	fs.DurationVar(&rafthttp.ConnReadTimeout, "raft-read-timeout", rafthttp.DefaultConnReadTimeout, "Read timeout set on each rafthttp connection")
-	fs.DurationVar(&rafthttp.ConnWriteTimeout, "raft-write-timeout", rafthttp.DefaultConnWriteTimeout, "Write timeout set on each rafthttp connection")
-
 	// clustering
 	fs.Var(
 		flags.NewUniqueURLsWithExceptions(DefaultInitialAdvertisePeerURLs, ""),

tests/framework/e2e/cluster.go

@@ -676,7 +676,7 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
 
 func values(cfg embed.Config) map[string]string {
 	fs := flag.NewFlagSet("etcd", flag.ContinueOnError)
-	cfg.AddFlags(fs)
+	cfg.AddFlagsWithoutGlobals(fs)
 	values := map[string]string{}
 	fs.VisitAll(func(f *flag.Flag) {
 		value := f.Value.String()