api: improve health API (#2158)

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Feb 26, 2020 · 904e833 · 904e833
1 parent 2a2b296
commit 904e833
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/server/api/health.go b/server/api/health.go
@@ -49,17 +49,17 @@ func (h *healthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	unhealthMembers := cluster.CheckHealth(members)
+	healthMembers := cluster.CheckHealth(members)
 	healths := []Health{}
 	for _, member := range members {
 		h := Health{
 			Name:       member.Name,
 			MemberID:   member.MemberId,
 			ClientUrls: member.ClientUrls,
-			Health:     true,
+			Health:     false,
 		}
-		if _, ok := unhealthMembers[member.GetMemberId()]; ok {
-			h.Health = false
+		if _, ok := healthMembers[member.GetMemberId()]; ok {
+			h.Health = true
 		}
 		healths = append(healths, h)
 	}

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1596,20 +1596,21 @@ var healthURL = "/pd/api/v1/ping"
 
 // CheckHealth checks if members are healthy.
 func CheckHealth(members []*pdpb.Member) map[uint64]*pdpb.Member {
-	unhealthMembers := make(map[uint64]*pdpb.Member)
+	healthMembers := make(map[uint64]*pdpb.Member)
 	for _, member := range members {
 		for _, cURL := range member.ClientUrls {
 			resp, err := DialClient.Get(fmt.Sprintf("%s%s", cURL, healthURL))
 			if resp != nil {
 				resp.Body.Close()
 			}
-			if err != nil || resp.StatusCode != http.StatusOK {
-				unhealthMembers[member.GetMemberId()] = member
+
+			if err == nil && resp.StatusCode == http.StatusOK {
+				healthMembers[member.GetMemberId()] = member
 				break
 			}
 		}
 	}
-	return unhealthMembers
+	return healthMembers
 }
 
 // GetMembers return a slice of Members.

diff --git a/tests/pdctl/health/health_test.go b/tests/pdctl/health/health_test.go
@@ -55,17 +55,17 @@ func (s *healthTestSuite) TestHealth(c *C) {
 	client := tc.GetEtcdClient()
 	members, err := cluster.GetMembers(client)
 	c.Assert(err, IsNil)
-	unhealthMembers := cluster.CheckHealth(members)
+	healthMembers := cluster.CheckHealth(members)
 	healths := []api.Health{}
 	for _, member := range members {
 		h := api.Health{
 			Name:       member.Name,
 			MemberID:   member.MemberId,
 			ClientUrls: member.ClientUrls,
-			Health:     true,
+			Health:     false,
 		}
-		if _, ok := unhealthMembers[member.GetMemberId()]; ok {
-			h.Health = false
+		if _, ok := healthMembers[member.GetMemberId()]; ok {
+			h.Health = true
 		}
 		healths = append(healths, h)
 	}