Merge branch 'develop' into simplify-addnode

cluster.go

@@ -1801,3 +1801,17 @@ func (c *Cluster) mergeClusterStatus(cs *internal.ClusterStatus) error {
 
 	return nil
 }
+
+func (c *Cluster) setStatic(hosts []string) error {
+	c.Static = true
+	c.Coordinator = c.Node.ID
+	for _, address := range hosts {
+		uri, err := NewURIFromAddress(address)
+		if err != nil {
+			return errors.Wrap(err, "getting URI")
+		}
+		c.Nodes = append(c.Nodes, &Node{URI: *uri})
+	}
+	c.MemberSet = NewStaticMemberSet(c.Nodes)
+	return nil
+}

server.go

@@ -52,11 +52,13 @@ type Server struct {
 	closing chan struct{}
 
 	// Internal
-	Holder        *Holder
-	Cluster       *Cluster
-	TranslateFile *TranslateFile
-	diagnostics   *DiagnosticsCollector
-	executor      *Executor
+	Holder          *Holder
+	Cluster         *Cluster
+	TranslateFile   *TranslateFile
+	diagnostics     *DiagnosticsCollector
+	executor        *Executor
+	hosts           []string
+	clusterDisabled bool
 
 	// External
 	handler           Handler
@@ -207,6 +209,16 @@ func OptServerURI(uri *URI) ServerOption {
 	}
 }
 
+// OptClusterDisabled tells the server whether to use a static cluster with the
+// defined hosts. Mostly used for testing.
+func OptServerClusterDisabled(disabled bool, hosts []string) ServerOption {
+	return func(s *Server) error {
+		s.hosts = hosts
+		s.clusterDisabled = disabled
+		return nil
+	}
+}
+
 // NewServer returns a new instance of Server.
 func NewServer(opts ...ServerOption) (*Server, error) {
 	s := &Server{
@@ -272,6 +284,12 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 		IsCoordinator: s.Cluster.Coordinator == s.NodeID,
 	}
 	s.Cluster.Node = node
+	if s.clusterDisabled {
+		err := s.Cluster.setStatic(s.hosts)
+		if err != nil {
+			return nil, errors.Wrap(err, "setting cluster static")
+		}
+	}
 
 	// Append the NodeID tag to stats.
 	s.Holder.Stats = s.Holder.Stats.WithTags(fmt.Sprintf("NodeID:%s", s.NodeID))
@@ -290,9 +308,8 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 // Open opens and initializes the server.
 func (s *Server) Open() error {
 	s.logger.Printf("open server")
-	// s.ln can be configured prior to Open() via s.OpenListener().
 	if s.ln == nil {
-		return errors.New("Must pass a listener option to NewServer")
+		return errors.New("must pass a listener option to NewServer")
 	}
 
 	// Log startup

server/server.go

@@ -242,6 +242,7 @@ func (m *Command) SetupServer() error {
 		pilosa.OptServerURI(uri),
 		pilosa.OptServerInternalClient(http.NewInternalClientFromURI(uri, c)),
 		pilosa.OptServerPrimaryTranslateStore(primaryTranslateStore),
+		pilosa.OptServerClusterDisabled(m.Config.Cluster.Disabled, m.Config.Cluster.Hosts),
 	)
 
 	return errors.Wrap(err, "new server")
@@ -250,19 +251,6 @@ func (m *Command) SetupServer() error {
 // SetupNetworking sets up internode communication based on the configuration.
 func (m *Command) SetupNetworking() error {
 	if m.Config.Cluster.Disabled {
-		m.Server.Cluster.Static = true
-		m.Server.Cluster.Coordinator = m.Server.NodeID
-		for _, address := range m.Config.Cluster.Hosts {
-			uri, err := pilosa.NewURIFromAddress(address)
-			if err != nil {
-				return errors.Wrap(err, "getting URI")
-			}
-			m.Server.Cluster.Nodes = append(m.Server.Cluster.Nodes, &pilosa.Node{
-				URI: *uri,
-			})
-		}
-
-		m.Server.Cluster.MemberSet = pilosa.NewStaticMemberSet(m.Server.Cluster.Nodes)
 		return nil
 	}