From 4267d368dfaf7b370d6fca491c8dcf451b3de606 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Wed, 26 Jul 2017 12:02:23 -0700
Subject: [PATCH] api/etcdhttp: serve error information in '/health', marshal
 health in JSON

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
---
 e2e/ctl_v3_alarm_test.go           |  2 +-
 e2e/metrics_test.go                |  2 +-
 etcdserver/api/etcdhttp/metrics.go | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/e2e/ctl_v3_alarm_test.go b/e2e/ctl_v3_alarm_test.go
index 50baae5e9..912620e81 100644
--- a/e2e/ctl_v3_alarm_test.go
+++ b/e2e/ctl_v3_alarm_test.go
@@ -53,7 +53,7 @@ func alarmTest(cx ctlCtx) {
 	}
 
 	// '/health' handler should return 'false'
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health": "false"}`}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health":false,"errors":["NOSPACE"]}`}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 
diff --git a/e2e/metrics_test.go b/e2e/metrics_test.go
index bbb9ee799..48d5edec2 100644
--- a/e2e/metrics_test.go
+++ b/e2e/metrics_test.go
@@ -41,7 +41,7 @@ func metricsTest(cx ctlCtx) {
 	if err := cURLGet(cx.epc, cURLReq{endpoint: "/metrics", expected: `etcd_debugging_mvcc_keys_total 1`, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
-	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health": "true"}`, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
+	if err := cURLGet(cx.epc, cURLReq{endpoint: "/health", expected: `{"health":true}`, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 }
diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go
index 7925924c3..03ae61642 100644
--- a/etcdserver/api/etcdhttp/metrics.go
+++ b/etcdserver/api/etcdhttp/metrics.go
@@ -16,7 +16,7 @@ package etcdhttp
 
 import (
 	"context"
-	"fmt"
+	"encoding/json"
 	"net/http"
 	"time"
 
@@ -57,7 +57,7 @@ func newHealthHandler(srv *etcdserver.EtcdServer) http.HandlerFunc {
 			return
 		}
 		h := checkHealth(srv)
-		d := []byte(fmt.Sprintf(`{"health": "%v"}`, h.Health))
+		d, _ := json.Marshal(h)
 		if !h.Health {
 			http.Error(w, string(d), http.StatusServiceUnavailable)
 			return
@@ -67,24 +67,34 @@ func newHealthHandler(srv *etcdserver.EtcdServer) http.HandlerFunc {
 	}
 }
 
+// TODO: remove manual parsing in etcdctl cluster-health
 type health struct {
-	Health bool `json:"health"`
+	Health bool     `json:"health"`
+	Errors []string `json:"errors,omitempty"`
 }
 
 func checkHealth(srv *etcdserver.EtcdServer) health {
 	h := health{Health: false}
-	if len(srv.Alarms()) > 0 {
-		// TODO: provide alarm lists
+
+	as := srv.Alarms()
+	if len(as) > 0 {
+		for _, v := range as {
+			h.Errors = append(h.Errors, v.Alarm.String())
+		}
 		return h
 	}
 
 	if uint64(srv.Leader()) == raft.None {
+		h.Errors = append(h.Errors, etcdserver.ErrNoLeader.Error())
 		return h
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	_, err := srv.Do(ctx, etcdserverpb.Request{Method: "QGET"})
 	cancel()
+	if err != nil {
+		h.Errors = append(h.Errors, err.Error())
+	}
 
 	h.Health = err == nil
 	return h