From 96ee00a322e5a6e4905625c6c6b6ca3cc48b6121 Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Tue, 29 Mar 2016 19:22:40 -0700
Subject: [PATCH] etcdserverpb: make alarm memberId uint64

To be consistent with Cluster API
---
 etcdserver/api/v3rpc/quota.go     | 2 +-
 etcdserver/etcdserverpb/rpc.pb.go | 4 ++--
 etcdserver/etcdserverpb/rpc.proto | 2 +-
 etcdserver/server.go              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etcdserver/api/v3rpc/quota.go b/etcdserver/api/v3rpc/quota.go
index ba2288d89..e415089cc 100644
--- a/etcdserver/api/v3rpc/quota.go
+++ b/etcdserver/api/v3rpc/quota.go
@@ -40,7 +40,7 @@ func (qa *quotaAlarmer) check(ctx context.Context, r interface{}) error {
 		return nil
 	}
 	req := &pb.AlarmRequest{
-		MemberID: int64(qa.id),
+		MemberID: uint64(qa.id),
 		Action:   pb.AlarmRequest_ACTIVATE,
 		Alarm:    pb.AlarmType_NOSPACE,
 	}
diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go
index 0f5b47851..ddb3e266a 100644
--- a/etcdserver/etcdserverpb/rpc.pb.go
+++ b/etcdserver/etcdserverpb/rpc.pb.go
@@ -1205,7 +1205,7 @@ func (m *DefragmentResponse) GetHeader() *ResponseHeader {
 type AlarmRequest struct {
 	Action AlarmRequest_AlarmAction `protobuf:"varint,1,opt,name=action,proto3,enum=etcdserverpb.AlarmRequest_AlarmAction" json:"action,omitempty"`
 	// MemberID is the member raising the alarm request
-	MemberID int64     `protobuf:"varint,2,opt,name=memberID,proto3" json:"memberID,omitempty"`
+	MemberID uint64    `protobuf:"varint,2,opt,name=memberID,proto3" json:"memberID,omitempty"`
 	Alarm    AlarmType `protobuf:"varint,3,opt,name=alarm,proto3,enum=etcdserverpb.AlarmType" json:"alarm,omitempty"`
 }
 
@@ -10085,7 +10085,7 @@ func (m *AlarmRequest) Unmarshal(data []byte) error {
 				}
 				b := data[iNdEx]
 				iNdEx++
-				m.MemberID |= (int64(b) & 0x7F) << shift
+				m.MemberID |= (uint64(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto
index bd5ad7fe5..cfe47a91f 100644
--- a/etcdserver/etcdserverpb/rpc.proto
+++ b/etcdserver/etcdserverpb/rpc.proto
@@ -453,7 +453,7 @@ message AlarmRequest {
   }
   AlarmAction action = 1;
   // MemberID is the member raising the alarm request
-  int64 memberID = 2;
+  uint64 memberID = 2;
   AlarmType alarm = 3;
 }
 
diff --git a/etcdserver/server.go b/etcdserver/server.go
index dab41d0c5..5df08da4f 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -1028,7 +1028,7 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint
 				plog.Errorf("applying raft message exceeded backend quota")
 				go func() {
 					a := &pb.AlarmRequest{
-						MemberID: int64(s.ID()),
+						MemberID: uint64(s.ID()),
 						Action:   pb.AlarmRequest_ACTIVATE,
 						Alarm:    pb.AlarmType_NOSPACE,
 					}