Merge pull request #1159 from travisturner/cluster-resize-staticmemberset

Cluster resize staticmemberset

broadcast.go

@@ -35,8 +35,10 @@ type StaticMemberSet struct {
 }
 
 // NewStaticMemberSet creates a statically defined MemberSet.
-func NewStaticMemberSet() *StaticMemberSet {
-	return &StaticMemberSet{}
+func NewStaticMemberSet(nodes []*Node) *StaticMemberSet {
+	return &StaticMemberSet{
+		nodes: nodes,
+	}
 }
 
 // Open implements the MemberSet interface to start network activity, but for a static MemberSet it does nothing.
@@ -44,12 +46,6 @@ func (s *StaticMemberSet) Open(n *Node) error {
 	return nil
 }
 
-// Join sets the MemberSet nodes to the slice of Nodes passed in.
-func (s *StaticMemberSet) Join(nodes []*Node) error {
-	s.nodes = nodes
-	return nil
-}
-
 // Broadcaster is an interface for broadcasting messages.
 type Broadcaster interface {
 	SendSync(pb proto.Message) error

server/server.go

@@ -227,13 +227,9 @@ func (m *Command) SetupNetworking() error {
 		}
 
 		m.Server.Broadcaster = pilosa.NopBroadcaster
-		m.Server.Cluster.MemberSet = pilosa.NewStaticMemberSet()
+		m.Server.Cluster.MemberSet = pilosa.NewStaticMemberSet(m.Server.Cluster.Nodes)
 		m.Server.BroadcastReceiver = pilosa.NopBroadcastReceiver
 		m.Server.Gossiper = pilosa.NopGossiper
-		err := m.Server.Cluster.MemberSet.(*pilosa.StaticMemberSet).Join(m.Server.Cluster.Nodes)
-		if err != nil {
-			return err
-		}
 		return nil
 	}
 

test/cluster.go

@@ -260,7 +260,7 @@ func (t *TestCluster) addCluster(i int, saveTopology bool) (*pilosa.Cluster, err
 	c.Path = path
 	c.Topology = pilosa.NewTopology()
 	c.Holder = h
-	c.MemberSet = pilosa.NewStaticMemberSet()
+	c.MemberSet = pilosa.NewStaticMemberSet(c.Nodes)
 	c.Node = node
 	c.Coordinator = t.common.Nodes[0].URI // the first node is the coordinator
 	c.Broadcaster = t