add cluster name while joining if there isn't already a cluster name …

…configured (#2)
signalfx · Mar 26, 2019 · 9a8ae20 · 9a8ae20
1 parent 6ce1f71
commit 9a8ae20
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/embetcd/server.go b/embetcd/server.go
@@ -100,8 +100,13 @@ func clusterNameConflicts(ctx context.Context, client *Client, clusterName strin
 		// then you run the risk of breaking quorum and stalling out on the cluster name check
 		resp, err = client.Get(ctx, "/name")
 		if err == nil {
-			if len(resp.Kvs) == 0 || string(resp.Kvs[0].Value) != clusterName {
-				err = ErrClusterNameConflict
+
+			if len(resp.Kvs) == 0 || string(resp.Kvs[0].Value) == "" {
+				_, _ = client.Put(ctx, "/name", clusterName)
+				return nil
+			}
+			if len(resp.Kvs) != 0 && string(resp.Kvs[0].Value) != clusterName {
+				return ErrClusterNameConflict
 			}
 			break
 		}