From 5dc6362f8a1f937a7ee80398a2b6aaf6cc7e9d1b Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 27 Jan 2015 10:22:53 -0800 Subject: [PATCH] rename probe.Healthy to probe.Success and renam probe.Unhealthy to probe.Failure. --- cmd/integration/integration.go | 2 +- pkg/apiserver/validator.go | 4 ++-- pkg/apiserver/validator_test.go | 4 ++-- pkg/client/kubelet_test.go | 4 ++-- pkg/kubelet/kubelet.go | 6 +++--- pkg/probe/exec/exec.go | 4 ++-- pkg/probe/exec/exec_test.go | 4 ++-- pkg/probe/http/http.go | 6 +++--- pkg/probe/http/http_test.go | 4 ++-- pkg/probe/probe.go | 12 ++++++------ pkg/probe/tcp/tcp.go | 4 ++-- pkg/probe/tcp/tcp_test.go | 4 ++-- pkg/registry/minion/healthy_registry.go | 2 +- pkg/registry/minion/healthy_registry_test.go | 6 +++--- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 6042368d90..dbf9a49c58 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -85,7 +85,7 @@ func (fakeKubeletClient) GetPodStatus(host, podNamespace, podID string) (api.Pod } func (fakeKubeletClient) HealthCheck(host string) (probe.Status, error) { - return probe.Healthy, nil + return probe.Success, nil } type delegateHandler struct { diff --git a/pkg/apiserver/validator.go b/pkg/apiserver/validator.go index 0d2aebae46..e1c47803cb 100644 --- a/pkg/apiserver/validator.go +++ b/pkg/apiserver/validator.go @@ -57,10 +57,10 @@ func (s *Server) check(client httpGet) (probe.Status, string, error) { return probe.Unknown, string(data), err } if resp.StatusCode != http.StatusOK { - return probe.Unhealthy, string(data), + return probe.Failure, string(data), fmt.Errorf("unhealthy http status code: %d (%s)", resp.StatusCode, resp.Status) } - return probe.Healthy, string(data), nil + return probe.Success, string(data), nil } type ServerStatus struct { diff --git a/pkg/apiserver/validator_test.go b/pkg/apiserver/validator_test.go index 7901121196..0a9477135a 100644 --- a/pkg/apiserver/validator_test.go +++ b/pkg/apiserver/validator_test.go @@ -59,8 +59,8 @@ func TestValidate(t *testing.T) { expectErr bool }{ {fmt.Errorf("test error"), "", probe.Unknown, 500 /*ignored*/, true}, - {nil, "foo", probe.Healthy, 200, false}, - {nil, "foo", probe.Unhealthy, 500, true}, + {nil, "foo", probe.Success, 200, false}, + {nil, "foo", probe.Failure, 500, true}, } s := Server{Addr: "foo.com", Port: 8080, Path: "/healthz"} diff --git a/pkg/client/kubelet_test.go b/pkg/client/kubelet_test.go index a5205f8781..a4ceda47f6 100644 --- a/pkg/client/kubelet_test.go +++ b/pkg/client/kubelet_test.go @@ -134,8 +134,8 @@ func TestNewKubeletClient(t *testing.T) { host := "127.0.0.1" healthStatus, err := client.HealthCheck(host) - if healthStatus != probe.Unhealthy { - t.Errorf("Expected %v and got %v.", probe.Unhealthy, healthStatus) + if healthStatus != probe.Failure { + t.Errorf("Expected %v and got %v.", probe.Failure, healthStatus) } if err != nil { t.Error("Expected a nil error") diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 242d808d15..d91820bd39 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1039,7 +1039,7 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, dockerContainers dockertools.Docke containersToKeep[containerID] = empty{} continue } - if healthy == probe.Healthy { + if healthy == probe.Success { containersToKeep[containerID] = empty{} continue } @@ -1401,10 +1401,10 @@ func (kl *Kubelet) GetPodStatus(podFullName string, uid types.UID) (api.PodStatu func (kl *Kubelet) probeLiveness(podFullName string, podUID types.UID, status api.PodStatus, container api.Container, dockerContainer *docker.APIContainers) (probe.Status, error) { // Give the container 60 seconds to start up. if container.LivenessProbe == nil { - return probe.Healthy, nil + return probe.Success, nil } if time.Now().Unix()-dockerContainer.Created < container.LivenessProbe.InitialDelaySeconds { - return probe.Healthy, nil + return probe.Success, nil } return kl.probeContainer(container.LivenessProbe, podFullName, podUID, status, container) } diff --git a/pkg/probe/exec/exec.go b/pkg/probe/exec/exec.go index 5633416168..ac5a0f2ccc 100644 --- a/pkg/probe/exec/exec.go +++ b/pkg/probe/exec/exec.go @@ -40,7 +40,7 @@ func (pr ExecProber) Probe(e uexec.Cmd) (probe.Status, error) { return probe.Unknown, err } if strings.ToLower(string(data)) != defaultHealthyOutput { - return probe.Unhealthy, nil + return probe.Failure, nil } - return probe.Healthy, nil + return probe.Success, nil } diff --git a/pkg/probe/exec/exec_test.go b/pkg/probe/exec/exec_test.go index a3e710a862..a2f21365ab 100644 --- a/pkg/probe/exec/exec_test.go +++ b/pkg/probe/exec/exec_test.go @@ -46,11 +46,11 @@ func TestExec(t *testing.T) { fake := FakeCmd{} tests := []healthCheckTest{ // Ok - {probe.Healthy, false, []byte("OK"), nil}, + {probe.Success, false, []byte("OK"), nil}, // Run returns error {probe.Unknown, true, []byte("OK, NOT"), fmt.Errorf("test error")}, // Unhealthy - {probe.Unhealthy, false, []byte("Fail"), nil}, + {probe.Failure, false, []byte("Fail"), nil}, } for _, test := range tests { fake.out = test.output diff --git a/pkg/probe/http/http.go b/pkg/probe/http/http.go index c8a8f05afa..fee63737cf 100644 --- a/pkg/probe/http/http.go +++ b/pkg/probe/http/http.go @@ -52,14 +52,14 @@ func DoHTTPProbe(url string, client HTTPGetInterface) (probe.Status, error) { res, err := client.Get(url) if err != nil { glog.V(1).Infof("HTTP probe error: %v", err) - return probe.Unhealthy, nil + return probe.Failure, nil } defer res.Body.Close() if res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusBadRequest { - return probe.Healthy, nil + return probe.Success, nil } glog.V(1).Infof("Health check failed for %s, Response: %v", url, *res) - return probe.Unhealthy, nil + return probe.Failure, nil } // formatURL formats a URL from args. For testability. diff --git a/pkg/probe/http/http_test.go b/pkg/probe/http/http_test.go index b1bea1ee38..fd9009f661 100644 --- a/pkg/probe/http/http_test.go +++ b/pkg/probe/http/http_test.go @@ -52,8 +52,8 @@ func TestHTTPProbeChecker(t *testing.T) { health probe.Status }{ // The probe will be filled in below. This is primarily testing that an HTTP GET happens. - {http.StatusOK, probe.Healthy}, - {-1, probe.Unhealthy}, + {http.StatusOK, probe.Success}, + {-1, probe.Failure}, } for _, test := range testCases { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/probe/probe.go b/pkg/probe/probe.go index 85881e3a90..b9d1a363a3 100644 --- a/pkg/probe/probe.go +++ b/pkg/probe/probe.go @@ -20,17 +20,17 @@ type Status int // Status values must be one of these constants. const ( - Healthy Status = iota - Unhealthy + Success Status = iota + Failure Unknown ) func (s Status) String() string { switch s { - case Healthy: - return "healthy" - case Unhealthy: - return "unhealthy" + case Success: + return "success" + case Failure: + return "failure" default: return "unknown" } diff --git a/pkg/probe/tcp/tcp.go b/pkg/probe/tcp/tcp.go index c4b0da523b..206aa74a13 100644 --- a/pkg/probe/tcp/tcp.go +++ b/pkg/probe/tcp/tcp.go @@ -42,11 +42,11 @@ func (pr TCPProber) Probe(host string, port int) (probe.Status, error) { func DoTCPProbe(addr string) (probe.Status, error) { conn, err := net.Dial("tcp", addr) if err != nil { - return probe.Unhealthy, nil + return probe.Failure, nil } err = conn.Close() if err != nil { glog.Errorf("unexpected error closing health check socket: %v (%#v)", err, err) } - return probe.Healthy, nil + return probe.Success, nil } diff --git a/pkg/probe/tcp/tcp_test.go b/pkg/probe/tcp/tcp_test.go index fd717e5d49..bd8f61fdac 100644 --- a/pkg/probe/tcp/tcp_test.go +++ b/pkg/probe/tcp/tcp_test.go @@ -35,8 +35,8 @@ func TestTcpHealthChecker(t *testing.T) { expectError bool }{ // The probe will be filled in below. This is primarily testing that a connection is made. - {probe.Healthy, true, false}, - {probe.Unhealthy, false, false}, + {probe.Success, true, false}, + {probe.Failure, false, false}, } server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/registry/minion/healthy_registry.go b/pkg/registry/minion/healthy_registry.go index 65271616bc..2ce68129e1 100644 --- a/pkg/registry/minion/healthy_registry.go +++ b/pkg/registry/minion/healthy_registry.go @@ -115,7 +115,7 @@ func (r *HealthyRegistry) doCheck(key string) util.T { case err != nil: glog.V(2).Infof("HealthyRegistry: node %q health check error: %v", key, err) nodeStatus = api.ConditionUnknown - case status == probe.Unhealthy: + case status == probe.Failure: nodeStatus = api.ConditionNone default: nodeStatus = api.ConditionFull diff --git a/pkg/registry/minion/healthy_registry_test.go b/pkg/registry/minion/healthy_registry_test.go index b3cd48d681..4bbfa72833 100644 --- a/pkg/registry/minion/healthy_registry_test.go +++ b/pkg/registry/minion/healthy_registry_test.go @@ -30,7 +30,7 @@ import ( type alwaysYes struct{} func (alwaysYes) HealthCheck(host string) (probe.Status, error) { - return probe.Healthy, nil + return probe.Success, nil } func TestBasicDelegation(t *testing.T) { @@ -77,9 +77,9 @@ type notMinion struct { func (n *notMinion) HealthCheck(host string) (probe.Status, error) { if host != n.minion { - return probe.Healthy, nil + return probe.Success, nil } else { - return probe.Unhealthy, nil + return probe.Failure, nil } }