Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: Clear default initial cluster

Browse Source 
NewConfig() should sets initial cluster from name but we should clear it
in the event that another discovery option has been specified.

Fixes #7516
This commit is contained in:
Jonathan Sokolowski 2017-03-16 13:46:44 +11:00 committed by Gyu-Ho Lee
parent 3221454cab
commit 72f37ff79a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embed/config.go
View File

@ -229,6 +229,9 @@ func (cfg *configYAML) configFromFile(path string) error {
cfg.ACUrls = []url.URL(u) cfg.ACUrls = []url.URL(u)
} }
if (cfg.Durl != "" || cfg.DNSCluster != "") && cfg.InitialCluster == cfg.InitialClusterFromName(cfg.Name) {
cfg.InitialCluster = ""
}
if cfg.ClusterState == "" { if cfg.ClusterState == "" {
cfg.ClusterState = ClusterStateFlagNew cfg.ClusterState = ClusterStateFlagNew
} }