From cc74eede7bfa109f512a3a887d4c5acfa5030eeb Mon Sep 17 00:00:00 2001 From: Cory LaNou Date: Fri, 6 Nov 2015 12:14:23 -0600 Subject: [PATCH] tweaks based on pr feedback --- meta/internal/meta.pb.go | 46 ++++++++++++++++++++-------------------- meta/internal/meta.proto | 6 +++--- meta/rpc.go | 28 ++++++++++++------------ meta/store.go | 2 +- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/meta/internal/meta.pb.go b/meta/internal/meta.pb.go index 5ebe535ff4f..f4d23e5781a 100644 --- a/meta/internal/meta.pb.go +++ b/meta/internal/meta.pb.go @@ -50,8 +50,8 @@ It has these top-level messages: FetchDataResponse JoinRequest JoinResponse - PromoteToRaftRequest - PromoteToRaftResponse + PromoteRaftRequest + PromoteRaftResponse */ package internal @@ -67,23 +67,23 @@ var _ = math.Inf type RPCType int32 const ( - RPCType_Error RPCType = 1 - RPCType_FetchData RPCType = 2 - RPCType_Join RPCType = 3 - RPCType_PromoteToRaft RPCType = 4 + RPCType_Error RPCType = 1 + RPCType_FetchData RPCType = 2 + RPCType_Join RPCType = 3 + RPCType_PromoteRaft RPCType = 4 ) var RPCType_name = map[int32]string{ 1: "Error", 2: "FetchData", 3: "Join", - 4: "PromoteToRaft", + 4: "PromoteRaft", } var RPCType_value = map[string]int32{ - "Error": 1, - "FetchData": 2, - "Join": 3, - "PromoteToRaft": 4, + "Error": 1, + "FetchData": 2, + "Join": 3, + "PromoteRaft": 4, } func (x RPCType) Enum() *RPCType { @@ -1613,48 +1613,48 @@ func (m *JoinResponse) GetNodeID() uint64 { return 0 } -type PromoteToRaftRequest struct { +type PromoteRaftRequest struct { Addr *string `protobuf:"bytes,1,req,name=Addr" json:"Addr,omitempty"` RaftNodes []string `protobuf:"bytes,2,rep,name=RaftNodes" json:"RaftNodes,omitempty"` XXX_unrecognized []byte `json:"-"` } -func (m *PromoteToRaftRequest) Reset() { *m = PromoteToRaftRequest{} } -func (m *PromoteToRaftRequest) String() string { return proto.CompactTextString(m) } -func (*PromoteToRaftRequest) ProtoMessage() {} +func (m *PromoteRaftRequest) Reset() { *m = PromoteRaftRequest{} } +func (m *PromoteRaftRequest) String() string { return proto.CompactTextString(m) } +func (*PromoteRaftRequest) ProtoMessage() {} -func (m *PromoteToRaftRequest) GetAddr() string { +func (m *PromoteRaftRequest) GetAddr() string { if m != nil && m.Addr != nil { return *m.Addr } return "" } -func (m *PromoteToRaftRequest) GetRaftNodes() []string { +func (m *PromoteRaftRequest) GetRaftNodes() []string { if m != nil { return m.RaftNodes } return nil } -type PromoteToRaftResponse struct { +type PromoteRaftResponse struct { Header *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"` Success *bool `protobuf:"varint,2,opt,name=Success" json:"Success,omitempty"` XXX_unrecognized []byte `json:"-"` } -func (m *PromoteToRaftResponse) Reset() { *m = PromoteToRaftResponse{} } -func (m *PromoteToRaftResponse) String() string { return proto.CompactTextString(m) } -func (*PromoteToRaftResponse) ProtoMessage() {} +func (m *PromoteRaftResponse) Reset() { *m = PromoteRaftResponse{} } +func (m *PromoteRaftResponse) String() string { return proto.CompactTextString(m) } +func (*PromoteRaftResponse) ProtoMessage() {} -func (m *PromoteToRaftResponse) GetHeader() *ResponseHeader { +func (m *PromoteRaftResponse) GetHeader() *ResponseHeader { if m != nil { return m.Header } return nil } -func (m *PromoteToRaftResponse) GetSuccess() bool { +func (m *PromoteRaftResponse) GetSuccess() bool { if m != nil && m.Success != nil { return *m.Success } diff --git a/meta/internal/meta.proto b/meta/internal/meta.proto index 08cb09d34d2..2308d6a3dff 100644 --- 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 index 652399825f8..d87558036a3 100644 --- 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 index 5ede63600d0..121574bde53 100644 --- 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) }