Merge pull request #2905 from benbjohnson/limit-cluster-size

Limit cluster to 3 nodes

CHANGELOG.md

@@ -12,6 +12,7 @@
 - [#2886](https://github.com/influxdb/influxdb/issues/2886): Refactor backup & restore
 - [#2804](https://github.com/influxdb/influxdb/pull/2804): BREAKING: change time literals to be single quoted in InfluxQL. Thanks @nvcook42!
 - [#2906](https://github.com/influxdb/influxdb/pull/2906): Restrict replication factor to the cluster size
+- [#2905](https://github.com/influxdb/influxdb/pull/2905): Restrict clusters to 3 peers
 
 ## v0.9.0-rc33 [2015-06-09]
 

meta/errors.go

@@ -8,6 +8,9 @@ var (
 
 	// ErrStoreClosed is returned when closing an already closed store.
 	ErrStoreClosed = errors.New("raft store already closed")
+
+	// ErrTooManyPeers is returned when more than 3 peers are used.
+	ErrTooManyPeers = errors.New("too many peers; influxdb v0.9.0 is limited to 3 nodes in a cluster")
 )
 
 var (

meta/store.go

@@ -129,6 +129,12 @@ func (s *Store) IDPath() string { return filepath.Join(s.path, "id") }
 
 // Open opens and initializes the raft store.
 func (s *Store) Open() error {
+	// Verify that no more than 3 peers.
+	// https://github.com/influxdb/influxdb/issues/2750
+	if len(s.peers) > 3 {
+		return ErrTooManyPeers
+	}
+
 	// Verify listeners are set.
 	if s.RaftListener == nil {
 		panic("Store.RaftListener not set")

meta/store_test.go

@@ -36,6 +36,17 @@ func TestStore_Open_ErrStoreOpen(t *testing.T) {
 	}
 }
 
+// Ensure that opening a store with more than 3 peers returns an error.
+func TestStore_Open_ErrTooManyPeers(t *testing.T) {
+	t.Parallel()
+	config := NewConfig(MustTempFile())
+	config.Peers = []string{"localhost:9000", "localhost:9001", "localhost:9002", "localhost:9003"}
+	s := NewStore(config)
+	if err := s.Open(); err != meta.ErrTooManyPeers {
+		t.Fatalf("unexpected error: %s", err)
+	}
+}
+
 // Ensure the store can create a new node.
 func TestStore_CreateNode(t *testing.T) {
 	t.Parallel()