tweaks based on pr feedback

influxdata · Nov 6, 2015 · cc74eed · cc74eed
1 parent 3c19fc8
commit cc74eed
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/meta/internal/meta.pb.go b/meta/internal/meta.pb.go
diff --git a/meta/internal/meta.proto b/meta/internal/meta.proto
@@ -322,7 +322,7 @@ enum RPCType {
     Error = 1;
     FetchData = 2;
     Join = 3;
-    PromoteToRaft = 4;
+    PromoteRaft = 4;
 }
 
 message ResponseHeader {
@@ -365,12 +365,12 @@ message JoinResponse {
     optional uint64 NodeID = 4;
 }
 
-message PromoteToRaftRequest {
+message PromoteRaftRequest {
     required string Addr = 1;
     repeated string RaftNodes = 2;
 }
 
-message PromoteToRaftResponse {
+message PromoteRaftResponse {
     required ResponseHeader Header = 1;
 
     optional bool Success = 2;

diff --git a/meta/rpc.go b/meta/rpc.go
@@ -88,7 +88,7 @@ func (r *rpc) handleRPCConn(conn net.Conn) {
 		return
 	}
 
-	if !r.store.IsLeader() && typ != internal.RPCType_PromoteToRaft {
+	if !r.store.IsLeader() && typ != internal.RPCType_PromoteRaft {
 		r.proxyLeader(conn.(*net.TCPConn), pack(typ, buf))
 		return
 	}
@@ -157,12 +157,12 @@ func (r *rpc) executeMessage(conn net.Conn, rpcType internal.RPCType, buf []byte
 		}
 		resp, err := r.handleJoinRequest(&req)
 		return rpcType, resp, err
-	case internal.RPCType_PromoteToRaft:
-		var req internal.PromoteToRaftRequest
+	case internal.RPCType_PromoteRaft:
+		var req internal.PromoteRaftRequest
 		if err := proto.Unmarshal(buf, &req); err != nil {
 			return internal.RPCType_Error, nil, fmt.Errorf("promote to raft request unmarshal: %v", err)
 		}
-		resp, err := r.handlePromoteToRaftRequest(&req)
+		resp, err := r.handlePromoteRaftRequest(&req)
 		return rpcType, resp, err
 	default:
 		return internal.RPCType_Error, nil, fmt.Errorf("unknown rpc type:%v", rpcType)
@@ -291,7 +291,7 @@ func (r *rpc) handleJoinRequest(req *internal.JoinRequest) (*internal.JoinRespon
 	}, err
 }
 
-func (r *rpc) handlePromoteToRaftRequest(req *internal.PromoteToRaftRequest) (*internal.PromoteToRaftResponse, error) {
+func (r *rpc) handlePromoteRaftRequest(req *internal.PromoteRaftRequest) (*internal.PromoteRaftResponse, error) {
 	r.traceCluster("promote raft request from: %v", *req.Addr)
 
 	// Need to set the local store peers to match what we are about to join
@@ -311,7 +311,7 @@ func (r *rpc) handlePromoteToRaftRequest(req *internal.PromoteToRaftRequest) (*i
 		return nil, err
 	}
 
-	return &internal.PromoteToRaftResponse{
+	return &internal.PromoteRaftResponse{
 		Header: &internal.ResponseHeader{
 			OK: proto.Bool(true),
 		},
@@ -398,10 +398,10 @@ func (r *rpc) join(localAddr, remoteAddr string) (*JoinResult, error) {
 	}
 }
 
-// promoteToRaft attempts to promote a node at remoteAddr using localAddr as the current
+// enableRaft attempts to promote a node at remoteAddr using localAddr as the current
 // node's cluster address
-func (r *rpc) promoteToRaft(addr string, peers []string) error {
-	req := &internal.PromoteToRaftRequest{
+func (r *rpc) enableRaft(addr string, peers []string) error {
+	req := &internal.PromoteRaftRequest{
 		Addr:      proto.String(addr),
 		RaftNodes: peers,
 	}
@@ -412,7 +412,7 @@ func (r *rpc) promoteToRaft(addr string, peers []string) error {
 	}
 
 	switch t := resp.(type) {
-	case *internal.PromoteToRaftResponse:
+	case *internal.PromoteRaftResponse:
 		return nil
 	case *internal.ErrorResponse:
 		return fmt.Errorf("rpc failed: %s", t.GetHeader().GetError())
@@ -431,8 +431,8 @@ func (r *rpc) call(dest string, req proto.Message) (proto.Message, error) {
 		rpcType = internal.RPCType_Join
 	case *internal.FetchDataRequest:
 		rpcType = internal.RPCType_FetchData
-	case *internal.PromoteToRaftRequest:
-		rpcType = internal.RPCType_PromoteToRaft
+	case *internal.PromoteRaftRequest:
+		rpcType = internal.RPCType_PromoteRaft
 	default:
 		return nil, fmt.Errorf("unknown rpc request type: %v", t)
 	}
@@ -489,8 +489,8 @@ func (r *rpc) call(dest string, req proto.Message) (proto.Message, error) {
 		resp = &internal.FetchDataResponse{}
 	case internal.RPCType_Error:
 		resp = &internal.ErrorResponse{}
-	case internal.RPCType_PromoteToRaft:
-		resp = &internal.PromoteToRaftResponse{}
+	case internal.RPCType_PromoteRaft:
+		resp = &internal.PromoteRaftResponse{}
 	default:
 		return nil, fmt.Errorf("unknown rpc response type: %v", rpcType)
 	}

diff --git a/meta/store.go b/meta/store.go
@@ -490,7 +490,7 @@ func (s *Store) promoteNodeToPeer() error {
 
 	// add node to peers list
 	peers = append(peers, n.Host)
-	if err := s.rpc.promoteToRaft(n.Host, peers); err != nil {
+	if err := s.rpc.enableRaft(n.Host, peers); err != nil {
 		return fmt.Errorf("error notifying raft peer: %s", err)
 	}