agent: Fixing passing filter. Fixes #241

hashicorp · Jul 5, 2014 · 135c409 · 135c409
1 parent 7ae573d
commit 135c409
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/command/agent/health_endpoint.go b/command/agent/health_endpoint.go
@@ -117,13 +117,15 @@ func (s *HTTPServer) HealthServiceNodes(resp http.ResponseWriter, req *http.Requ
 // filterNonPassing is used to filter out any nodes that have check that are not passing
 func filterNonPassing(nodes structs.CheckServiceNodes) structs.CheckServiceNodes {
 	n := len(nodes)
+OUTER:
 	for i := 0; i < n; i++ {
 		node := nodes[i]
 		for _, check := range node.Checks {
 			if check.Status != structs.HealthPassing {
 				nodes[i], nodes[n-1] = nodes[n-1], structs.CheckServiceNode{}
 				n--
 				i--
+				continue OUTER
 			}
 		}
 	}

diff --git a/command/agent/health_endpoint_test.go b/command/agent/health_endpoint_test.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"reflect"
 	"testing"
 )
 
@@ -182,3 +183,39 @@ func TestHealthServiceNodes_PassingFilter(t *testing.T) {
 		t.Fatalf("bad: %v", obj)
 	}
 }
+
+func TestFilterNonPassing(t *testing.T) {
+	nodes := structs.CheckServiceNodes{
+		structs.CheckServiceNode{
+			Checks: structs.HealthChecks{
+				&structs.HealthCheck{
+					Status: structs.HealthCritical,
+				},
+				&structs.HealthCheck{
+					Status: structs.HealthCritical,
+				},
+			},
+		},
+		structs.CheckServiceNode{
+			Checks: structs.HealthChecks{
+				&structs.HealthCheck{
+					Status: structs.HealthCritical,
+				},
+				&structs.HealthCheck{
+					Status: structs.HealthCritical,
+				},
+			},
+		},
+		structs.CheckServiceNode{
+			Checks: structs.HealthChecks{
+				&structs.HealthCheck{
+					Status: structs.HealthPassing,
+				},
+			},
+		},
+	}
+	out := filterNonPassing(nodes)
+	if len(out) != 1 && reflect.DeepEqual(out[0], nodes[2]) {
+		t.Fatalf("bad: %v", out)
+	}
+}