stubbing out drop server command

commands.go

@@ -47,8 +47,15 @@ const (
 
 	// Privilege messages
 	setPrivilegeMessageType = messaging.MessageType(0x90)
+
+	// Server messages
+	dropServerMessageType = messaging.MessageType(0x100)
 )
 
+type dropServerCommand struct {
+	NodeID uint64 `json:"nodeid"`
+}
+
 type createDataNodeCommand struct {
 	URL string `json:"url"`
 }

influxdb.go

@@ -43,8 +43,8 @@ var (
 	// attempting to join another data node when no data nodes exist yet
 	ErrDataNodeNotFound = errors.New("data node not found")
 
-	// ErrDataNodeRequired is returned when using a blank data node id.
-	ErrDataNodeRequired = errors.New("data node required")
+	// ErrServerNodeIDRequired is returned when using a zero server node id.
+	ErrServerNodeIDRequired = errors.New("server node id must be greater than 0")
 
 	// ErrDatabaseNameRequired is returned when creating a database without a name.
 	ErrDatabaseNameRequired = errors.New("database name required")

server.go

@@ -855,6 +855,17 @@ func (s *Server) DataNodes() (a []*DataNode) {
 	return
 }
 
+// DropServer removes a server from the cluster
+// Curently it will drop both a broker and/or a data node
+func (s *Server) DropServer(nodeID uint64) error {
+	if nodeID == 0 {
+		return ErrServerNodeIDRequired
+	}
+	c := &dropServerCommand{NodeID: nodeID}
+	_, err := s.broadcast(dropServerMessageType, c)
+	return err
+}
+
 // CreateDataNode creates a new data node with a given URL.
 func (s *Server) CreateDataNode(u *url.URL) error {
 	c := &createDataNodeCommand{URL: u.String()}
@@ -2159,6 +2170,8 @@ func (s *Server) ExecuteQuery(q *influxql.Query, database string, user *User, ch
 				res = s.executeDropDatabaseStatement(stmt, user)
 			case *influxql.ShowDatabasesStatement:
 				res = s.executeShowDatabasesStatement(stmt, user)
+			case *influxql.DropServerStatement:
+				res = s.executeDropServerStatement(stmt, user)
 			case *influxql.ShowServersStatement:
 				res = s.executeShowServersStatement(stmt, user)
 			case *influxql.CreateUserStatement:
@@ -2436,6 +2449,10 @@ func (s *Server) executeShowDatabasesStatement(q *influxql.ShowDatabasesStatemen
 	return &Result{Series: []*influxql.Row{row}}
 }
 
+func (s *Server) executeDropServerStatement(q *influxql.DropServerStatement, user *User) *Result {
+	return &Result{Err: s.DropServer(q.NodeID)}
+}
+
 func (s *Server) executeShowServersStatement(q *influxql.ShowServersStatement, user *User) *Result {
 	row := &influxql.Row{Columns: []string{"id", "url"}}
 	for _, node := range s.DataNodes() {