Add Error information to nodes/ output

http/service.go

@@ -702,6 +702,7 @@ func (s *Service) handleNodes(w http.ResponseWriter, r *http.Request) {
 		Reachable bool    `json:"reachable"`
 		Leader    bool    `json:"leader"`
 		Time      float64 `json:"time,omitempty"`
+		Error     string  `json:"error,omitempty"`
 	})
 
 	for _, n := range filteredNodes {
@@ -711,6 +712,7 @@ func (s *Service) handleNodes(w http.ResponseWriter, r *http.Request) {
 		nn.APIAddr = nodesResp[n.ID].apiAddr
 		nn.Reachable = nodesResp[n.ID].reachable
 		nn.Time = nodesResp[n.ID].time.Seconds()
+		nn.Error = nodesResp[n.ID].error
 		resp[n.ID] = nn
 	}
 
@@ -991,6 +993,7 @@ type checkNodesResponse struct {
 	apiAddr   string
 	reachable bool
 	time      time.Duration
+	error     string
 }
 
 // checkNodes returns a map of node ID to node responsivness, reachable
@@ -1009,15 +1012,18 @@ func (s *Service) checkNodes(nodes []*store.Server, timeout time.Duration) (map[
 		wg.Add(1)
 		go func(id, raftAddr string) {
 			defer wg.Done()
+			mu.Lock()
+			defer mu.Unlock()
+
 			start := time.Now()
 			apiAddr, err := s.cluster.GetNodeAPIAddr(raftAddr)
-			if err == nil {
-				mu.Lock()
-				resp[id].reachable = true
-				resp[id].apiAddr = apiAddr
-				resp[id].time = time.Since(start)
-				mu.Unlock()
+			if err != nil {
+				resp[id].error = err.Error()
+				return
 			}
+			resp[id].reachable = true
+			resp[id].apiAddr = apiAddr
+			resp[id].time = time.Since(start)
 		}(n.ID, n.Addr)
 	}
 	wg.Wait()

system_test/full_system_test.py

@@ -528,14 +528,17 @@ class TestEndToEnd(unittest.TestCase):
     self.assertEqual(nodes[l.node_id]['leader'], True)
     self.assertEqual(nodes[l.node_id]['reachable'], True)
     self.assertEqual(nodes[l.node_id]['api_addr'], l.APIProtoAddr())
+    self.assertTrue(nodes[fs[0].node_id].has_key('time'))
     for n in [fs[0], fs[1]]:
       self.assertEqual(nodes[n.node_id]['leader'], False)
       self.assertEqual(nodes[n.node_id]['reachable'], True)
       self.assertEqual(nodes[n.node_id]['api_addr'], n.APIProtoAddr())
+      self.assertTrue(nodes[n.node_id].has_key('time'))
 
     fs[0].stop()
     nodes = l.nodes()
     self.assertEqual(nodes[fs[0].node_id]['reachable'], False)
+    self.assertTrue(nodes[fs[0].node_id].has_key('error'))
     self.assertEqual(nodes[fs[1].node_id]['reachable'], True)
     self.assertEqual(nodes[l.node_id]['reachable'], True)