*: pid to id (#448)

glide.yaml

@@ -120,7 +120,7 @@ import:
 - package: github.com/pingcap/check
   version: ce8a2f822ab1e245a4eefcef2996531c79c943f1
 - package: github.com/pingcap/kvproto
-  version: 679b4719adb44bb55780ad2480f29a0f234b039e
+  version: 4416a5a5ad6f6c63c27904c85c67c26133059127
   subpackages:
   - pkg/coprocessor
   - pkg/eraftpb

server/api/member.go

@@ -101,7 +101,7 @@ func (h *memberDeleteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 type leaderInfo struct {
 	Addr string `json:"addr"`
-	Pid  int64  `json:"pid"`
+	ID   uint64 `json:"id"`
 }
 
 type leaderHandler struct {
@@ -125,7 +125,7 @@ func (h *leaderHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	ret := leaderInfo{
 		Addr: leader.Addr,
-		Pid:  leader.Pid,
+		ID:   leader.Id,
 	}
 	h.rd.JSON(w, http.StatusOK, ret)
 }

server/api/member_test.go

@@ -181,5 +181,5 @@ func (s *testMemberAPISuite) TestMemberLeader(c *C) {
 	var got leaderInfo
 	json.Unmarshal(buf, &got)
 	c.Assert(got.Addr, Equals, leader.GetAddr())
-	c.Assert(got.Pid, Equals, leader.GetPid())
+	c.Assert(got.ID, Equals, leader.GetId())
 }

server/api/templates/docs/pd.swagger.json

@@ -394,10 +394,10 @@
                     "type": "string",
                     "description": "The leader's client URLs."
                 },
-                "pid": {
+                "id": {
                     "type": "integer",
-                    "format": "int64",
-                    "description": "The leader's process id."
+                    "format": "uint64",
+                    "description": "The leader's id."
                 }
             }
         },

server/leader.go

@@ -14,7 +14,6 @@
 package server
 
 import (
-	"os"
 	"path"
 	"sync/atomic"
 	"time"
@@ -121,13 +120,13 @@ func (s *Server) GetLeader() (*pdpb.Leader, error) {
 }
 
 func (s *Server) isSameLeader(leader *pdpb.Leader) bool {
-	return leader.GetAddr() == s.GetAddr() && leader.GetPid() == int64(os.Getpid())
+	return leader.GetAddr() == s.GetAddr() && leader.GetId() == s.ID()
 }
 
 func (s *Server) marshalLeader() string {
 	leader := &pdpb.Leader{
 		Addr: s.GetAddr(),
-		Pid:  int64(os.Getpid()),
+		Id:   s.ID(),
 	}
 
 	data, err := leader.Marshal()