From 8a311e5b76d898ed9ae92414b4d7e571efb8ee4b Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 6 Oct 2014 20:07:51 -0400
Subject: [PATCH] remove new cluster check

---
 etcdserver/config.go      | 16 +++++++---------
 etcdserver/config_test.go |  5 ++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/etcdserver/config.go b/etcdserver/config.go
index 22f489b70..c0b00b868 100644
--- a/etcdserver/config.go
+++ b/etcdserver/config.go
@@ -28,16 +28,14 @@ func (c *ServerConfig) Verify() error {
 		return fmt.Errorf("could not find name %v in cluster!", c.Name)
 	}
 
-	if c.ClusterState == ClusterStateValueNew {
-		// No identical IPs in the cluster peer list
-		urlMap := make(map[string]bool)
-		for _, m := range *c.Cluster {
-			for _, url := range m.PeerURLs {
-				if urlMap[url] {
-					return fmt.Errorf("duplicate url %v in server config", url)
-				}
-				urlMap[url] = true
+	// No identical IPs in the cluster peer list
+	urlMap := make(map[string]bool)
+	for _, m := range *c.Cluster {
+		for _, url := range m.PeerURLs {
+			if urlMap[url] {
+				return fmt.Errorf("duplicate url %v in server config", url)
 			}
+			urlMap[url] = true
 		}
 	}
 	return nil
diff --git a/etcdserver/config_test.go b/etcdserver/config_test.go
index 0fc6050d1..e02d834b5 100644
--- a/etcdserver/config_test.go
+++ b/etcdserver/config_test.go
@@ -19,9 +19,8 @@ func TestConfigVerify(t *testing.T) {
 		cluster := &Cluster{}
 		cluster.Set(tt.clusterSetting)
 		cfg := ServerConfig{
-			Name:         "node1",
-			Cluster:      cluster,
-			ClusterState: ClusterStateValueNew,
+			Name:    "node1",
+			Cluster: cluster,
 		}
 		err := cfg.Verify()
 		if (err == nil) && tt.shouldError {