From 41bdfceb577fdfdcf9ce89f2afcfa9397b50d39a Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Wed, 27 Jun 2018 07:22:32 -0500
Subject: [PATCH] remove MemberSet from cluster, Open in server package

---
 cluster.go             | 13 +++----------
 server/server.go       |  3 +--
 utils_internal_test.go |  1 -
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/cluster.go b/cluster.go
index 75c29ceb8..e10aae84e 100644
--- a/cluster.go
+++ b/cluster.go
@@ -212,10 +212,9 @@ type nodeAction struct {
 
 // Cluster represents a collection of nodes.
 type Cluster struct {
-	ID        string
-	Node      *Node
-	Nodes     []*Node // TODO phase this out?
-	MemberSet MemberSet
+	ID    string
+	Node  *Node
+	Nodes []*Node // TODO phase this out?
 
 	// Hashing algorithm used to assign partitions to nodes.
 	Hasher Hasher
@@ -897,11 +896,6 @@ func (c *Cluster) open() error {
 }
 
 func (c *Cluster) waitForStarted() error {
-	// Open MemberSet communication.
-	if err := c.MemberSet.Open(); err != nil {
-		return errors.Wrap(err, "opening MemberSet")
-	}
-
 	// If not coordinator then wait for ClusterStatus from coordinator.
 	if !c.isCoordinator() {
 		// In the case where a node has been restarted and memberlist has
@@ -1821,6 +1815,5 @@ func (c *Cluster) setStatic(hosts []string) error {
 		}
 		c.Nodes = append(c.Nodes, &Node{URI: *uri})
 	}
-	c.MemberSet = NewStaticMemberSet(c.Nodes)
 	return nil
 }
diff --git a/server/server.go b/server/server.go
index 614a4efcf..cfb06fc3a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -329,8 +329,7 @@ func (m *Command) SetupNetworking() error {
 	if err != nil {
 		return errors.Wrap(err, "getting memberset")
 	}
-	m.Server.Cluster.MemberSet = gossipMemberSet
-	return nil
+	return errors.Wrap(gossipMemberSet.Open(), "opening gossip memberset")
 }
 
 // Close shuts down the server.
diff --git a/utils_internal_test.go b/utils_internal_test.go
index ea98875c4..20ff2b70b 100644
--- a/utils_internal_test.go
+++ b/utils_internal_test.go
@@ -228,7 +228,6 @@ func (t *ClusterCluster) addCluster(i int, saveTopology bool) (*Cluster, error)
 	c.Path = path
 	c.Topology = NewTopology()
 	c.Holder = h
-	c.MemberSet = NewStaticMemberSet(c.Nodes)
 	c.Node = node
 	c.Coordinator = t.common.Nodes[0].ID // the first node is the coordinator
 	c.Broadcaster = t