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

remove new cluster check

Browse Source
This commit is contained in:
Barak Michener 2014-10-06 20:07:51 -04:00
parent 1a0195e07e
commit 8a311e5b76
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/config.go
View File

@ -28,7 +28,6 @@ func (c *ServerConfig) Verify() error {
return fmt.Errorf("could not find name %v in cluster!", c.Name) return fmt.Errorf("could not find name %v in cluster!", c.Name)
} }
if c.ClusterState == ClusterStateValueNew {
// No identical IPs in the cluster peer list // No identical IPs in the cluster peer list
urlMap := make(map[string]bool) urlMap := make(map[string]bool)
for _, m := range *c.Cluster { for _, m := range *c.Cluster {
@ -39,6 +38,5 @@ func (c *ServerConfig) Verify() error {
urlMap[url] = true urlMap[url] = true
} }
} }
}
return nil return nil
} }

1
etcdserver/config_test.go
View File

@ -21,7 +21,6 @@ func TestConfigVerify(t *testing.T) {
cfg := ServerConfig{ cfg := ServerConfig{
Name: "node1", Name: "node1",
Cluster: cluster, Cluster: cluster,
ClusterState: ClusterStateValueNew,
} }
err := cfg.Verify() err := cfg.Verify()
if (err == nil) && tt.shouldError { if (err == nil) && tt.shouldError {