Split health_check.go into smaller parts.
Distinct files for core, http, and tcp.
This commit is contained in:
Tim Hockin
@@ -16,13 +16,64 @@ limitations under the License.
|
|||||||
|
|
||||||
package health
|
package health
|
||||||
|
|
||||||
import ()
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
|
"github.com/golang/glog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Status represents the result of a single health-check operation.
|
||||||
type Status int
|
type Status int
|
||||||
|
|
||||||
// Status takes only one of values of these constants.
|
// Status values must be one of these constants.
|
||||||
const (
|
const (
|
||||||
Healthy Status = iota
|
Healthy Status = iota
|
||||||
Unhealthy
|
Unhealthy
|
||||||
Unknown
|
Unknown
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// HealthChecker defines an abstract interface for checking container health.
|
||||||
|
type HealthChecker interface {
|
||||||
|
HealthCheck(currentState api.PodState, container api.Container) (Status, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHealthChecker creates a new HealthChecker which supports multiple types of liveness probes.
|
||||||
|
func NewHealthChecker() HealthChecker {
|
||||||
|
return &MuxHealthChecker{
|
||||||
|
checkers: map[string]HealthChecker{
|
||||||
|
"http": &HTTPHealthChecker{
|
||||||
|
client: &http.Client{},
|
||||||
|
},
|
||||||
|
"tcp": &TCPHealthChecker{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MuxHealthChecker bundles multiple implementations of HealthChecker of different types.
|
||||||
|
type MuxHealthChecker struct {
|
||||||
|
checkers map[string]HealthChecker
|
||||||
|
}
|
||||||
|
|
||||||
|
// HealthCheck delegates the health-checking of the container to one of the bundled implementations.
|
||||||
|
// It chooses an implementation according to container.LivenessProbe.Type.
|
||||||
|
// If there is no matching health checker it returns Unknown, nil.
|
||||||
|
func (m *MuxHealthChecker) HealthCheck(currentState api.PodState, container api.Container) (Status, error) {
|
||||||
|
checker, ok := m.checkers[container.LivenessProbe.Type]
|
||||||
|
if !ok || checker == nil {
|
||||||
|
glog.Warningf("Failed to find health checker for %s %s", container.Name, container.LivenessProbe.Type)
|
||||||
|
return Unknown, nil
|
||||||
|
}
|
||||||
|
return checker.HealthCheck(currentState, container)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A helper function to look up a port in a container by name.
|
||||||
|
// Returns the HostPort if found, -1 if not found.
|
||||||
|
func findPortByName(container api.Container, portName string) int {
|
||||||
|
for _, port := range container.Ports {
|
||||||
|
if port.Name == portName {
|
||||||
|
return port.HostPort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,343 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2014 Google Inc. All rights reserved.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package health
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"net/url"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
||||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
const statusServerEarlyShutdown = -1
|
|
||||||
|
|
||||||
func TestHealthChecker(t *testing.T) {
|
|
||||||
var healthCheckerTests = []struct {
|
|
||||||
status int
|
|
||||||
health Status
|
|
||||||
}{
|
|
||||||
{http.StatusOK, Healthy},
|
|
||||||
{statusServerEarlyShutdown, Unknown},
|
|
||||||
{http.StatusBadRequest, Unhealthy},
|
|
||||||
{http.StatusBadGateway, Unhealthy},
|
|
||||||
{http.StatusInternalServerError, Unhealthy},
|
|
||||||
}
|
|
||||||
for _, healthCheckerTest := range healthCheckerTests {
|
|
||||||
tt := healthCheckerTest
|
|
||||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(tt.status)
|
|
||||||
}))
|
|
||||||
u, err := url.Parse(ts.URL)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
host, port, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if tt.status == statusServerEarlyShutdown {
|
|
||||||
ts.Close()
|
|
||||||
}
|
|
||||||
container := api.Container{
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
HTTPGet: &api.HTTPGetProbe{
|
|
||||||
Port: util.MakeIntOrStringFromString(port),
|
|
||||||
Path: "/foo/bar",
|
|
||||||
Host: host,
|
|
||||||
},
|
|
||||||
Type: "http",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
hc := NewHealthChecker()
|
|
||||||
health, err := hc.HealthCheck(api.PodState{}, container)
|
|
||||||
if err != nil && tt.health != Unknown {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if health != tt.health {
|
|
||||||
t.Errorf("Expected %v, got %v", tt.health, health)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFindPort(t *testing.T) {
|
|
||||||
container := api.Container{
|
|
||||||
Ports: []api.Port{
|
|
||||||
{
|
|
||||||
Name: "foo",
|
|
||||||
HostPort: 8080,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "bar",
|
|
||||||
HostPort: 9000,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
want := 8080
|
|
||||||
got := findPortByName(container, "foo")
|
|
||||||
if got != want {
|
|
||||||
t.Errorf("Expected %v, got %v", want, got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetURLParts(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
probe *api.HTTPGetProbe
|
|
||||||
ok bool
|
|
||||||
host string
|
|
||||||
port int
|
|
||||||
path string
|
|
||||||
}{
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromInt(-1), Path: ""}, false, "", -1, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString(""), Path: ""}, false, "", -1, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("-1"), Path: ""}, false, "", -1, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("not-found"), Path: ""}, false, "", -1, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("found"), Path: ""}, true, "127.0.0.1", 93, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromInt(76), Path: ""}, true, "127.0.0.1", 76, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("118"), Path: ""}, true, "127.0.0.1", 118, ""},
|
|
||||||
{&api.HTTPGetProbe{Host: "hostname", Port: util.MakeIntOrStringFromInt(76), Path: "path"}, true, "hostname", 76, "path"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, test := range testCases {
|
|
||||||
state := api.PodState{PodIP: "127.0.0.1"}
|
|
||||||
container := api.Container{
|
|
||||||
Ports: []api.Port{{Name: "found", HostPort: 93}},
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
HTTPGet: test.probe,
|
|
||||||
Type: "http",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
host, port, path, err := getURLParts(state, container)
|
|
||||||
if !test.ok && err == nil {
|
|
||||||
t.Errorf("Expected error for %+v, got %s:%d/%s", test, host, port, path)
|
|
||||||
}
|
|
||||||
if test.ok && err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if test.ok {
|
|
||||||
if host != test.host || port != test.port || path != test.path {
|
|
||||||
t.Errorf("Expected %s:%d/%s, got %s:%d/%s",
|
|
||||||
test.host, test.port, test.path, host, port, path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFormatURL(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
host string
|
|
||||||
port int
|
|
||||||
path string
|
|
||||||
result string
|
|
||||||
}{
|
|
||||||
{"localhost", 93, "", "http://localhost:93"},
|
|
||||||
{"localhost", 93, "/path", "http://localhost:93/path"},
|
|
||||||
}
|
|
||||||
for _, test := range testCases {
|
|
||||||
url := formatURL(test.host, test.port, test.path)
|
|
||||||
if url != test.result {
|
|
||||||
t.Errorf("Expected %s, got %s", test.result, url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHTTPHealthChecker(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
probe *api.HTTPGetProbe
|
|
||||||
status int
|
|
||||||
health Status
|
|
||||||
}{
|
|
||||||
// The probe will be filled in below. This is primarily testing that an HTTP GET happens.
|
|
||||||
{&api.HTTPGetProbe{}, http.StatusOK, Healthy},
|
|
||||||
{&api.HTTPGetProbe{}, -1, Unhealthy},
|
|
||||||
{nil, -1, Unknown},
|
|
||||||
}
|
|
||||||
hc := &HTTPHealthChecker{
|
|
||||||
client: &http.Client{},
|
|
||||||
}
|
|
||||||
for _, test := range testCases {
|
|
||||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(test.status)
|
|
||||||
}))
|
|
||||||
u, err := url.Parse(ts.URL)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
host, port, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
container := api.Container{
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
HTTPGet: test.probe,
|
|
||||||
Type: "http",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
params := container.LivenessProbe.HTTPGet
|
|
||||||
if params != nil {
|
|
||||||
params.Port = util.MakeIntOrStringFromString(port)
|
|
||||||
params.Host = host
|
|
||||||
}
|
|
||||||
health, err := hc.HealthCheck(api.PodState{PodIP: host}, container)
|
|
||||||
if test.health == Unknown && err == nil {
|
|
||||||
t.Errorf("Expected error")
|
|
||||||
}
|
|
||||||
if test.health != Unknown && err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if health != test.health {
|
|
||||||
t.Errorf("Expected %v, got %v", test.health, health)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetTCPAddrParts(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
probe *api.TCPSocketProbe
|
|
||||||
ok bool
|
|
||||||
host string
|
|
||||||
port int
|
|
||||||
}{
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromInt(-1)}, false, "", -1},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("")}, false, "", -1},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("-1")}, false, "", -1},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("not-found")}, false, "", -1},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("found")}, true, "1.2.3.4", 93},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromInt(76)}, true, "1.2.3.4", 76},
|
|
||||||
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("118")}, true, "1.2.3.4", 118},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, test := range testCases {
|
|
||||||
state := api.PodState{PodIP: "1.2.3.4"}
|
|
||||||
container := api.Container{
|
|
||||||
Ports: []api.Port{{Name: "found", HostPort: 93}},
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
TCPSocket: test.probe,
|
|
||||||
Type: "tcp",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
host, port, err := getTCPAddrParts(state, container)
|
|
||||||
if !test.ok && err == nil {
|
|
||||||
t.Errorf("Expected error for %+v, got %s:%d", test, host, port)
|
|
||||||
}
|
|
||||||
if test.ok && err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if test.ok {
|
|
||||||
if host != test.host || port != test.port {
|
|
||||||
t.Errorf("Expected %s:%d, got %s:%d", test.host, test.port, host, port)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestTcpHealthChecker(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
probe *api.TCPSocketProbe
|
|
||||||
expectedStatus Status
|
|
||||||
expectError bool
|
|
||||||
}{
|
|
||||||
// The probe will be filled in below. This is primarily testing that a connection is made.
|
|
||||||
{&api.TCPSocketProbe{}, Healthy, false},
|
|
||||||
{&api.TCPSocketProbe{}, Unhealthy, false},
|
|
||||||
{nil, Unknown, true},
|
|
||||||
}
|
|
||||||
|
|
||||||
checker := &TCPHealthChecker{}
|
|
||||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}))
|
|
||||||
u, err := url.Parse(server.URL)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
host, port, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
for _, test := range tests {
|
|
||||||
container := api.Container{
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
TCPSocket: test.probe,
|
|
||||||
Type: "tcp",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
params := container.LivenessProbe.TCPSocket
|
|
||||||
if params != nil && test.expectedStatus == Healthy {
|
|
||||||
params.Port = util.MakeIntOrStringFromString(port)
|
|
||||||
}
|
|
||||||
status, err := checker.HealthCheck(api.PodState{PodIP: host}, container)
|
|
||||||
if status != test.expectedStatus {
|
|
||||||
t.Errorf("expected: %v, got: %v", test.expectedStatus, status)
|
|
||||||
}
|
|
||||||
if err != nil && !test.expectError {
|
|
||||||
t.Errorf("unexpected error: %#v", err)
|
|
||||||
}
|
|
||||||
if err == nil && test.expectError {
|
|
||||||
t.Errorf("unexpected non-error.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMuxHealthChecker(t *testing.T) {
|
|
||||||
muxHealthCheckerTests := []struct {
|
|
||||||
health Status
|
|
||||||
probeType string
|
|
||||||
}{
|
|
||||||
{Healthy, "http"},
|
|
||||||
{Unknown, "ftp"},
|
|
||||||
}
|
|
||||||
mc := &MuxHealthChecker{
|
|
||||||
checkers: make(map[string]HealthChecker),
|
|
||||||
}
|
|
||||||
hc := &HTTPHealthChecker{
|
|
||||||
client: &http.Client{},
|
|
||||||
}
|
|
||||||
mc.checkers["http"] = hc
|
|
||||||
for _, muxHealthCheckerTest := range muxHealthCheckerTests {
|
|
||||||
tt := muxHealthCheckerTest
|
|
||||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}))
|
|
||||||
u, err := url.Parse(ts.URL)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
host, port, err := net.SplitHostPort(u.Host)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
container := api.Container{
|
|
||||||
LivenessProbe: &api.LivenessProbe{
|
|
||||||
HTTPGet: &api.HTTPGetProbe{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
container.LivenessProbe.Type = tt.probeType
|
|
||||||
container.LivenessProbe.HTTPGet.Port = util.MakeIntOrStringFromString(port)
|
|
||||||
container.LivenessProbe.HTTPGet.Host = host
|
|
||||||
health, err := mc.HealthCheck(api.PodState{}, container)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if health != tt.health {
|
|
||||||
t.Errorf("Expected %v, got %v", tt.health, health)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
144
pkg/health/health_test.go
Normal file
144
pkg/health/health_test.go
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2014 Google Inc. All rights reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const statusServerEarlyShutdown = -1
|
||||||
|
|
||||||
|
func TestHealthChecker(t *testing.T) {
|
||||||
|
var healthCheckerTests = []struct {
|
||||||
|
status int
|
||||||
|
health Status
|
||||||
|
}{
|
||||||
|
{http.StatusOK, Healthy},
|
||||||
|
{statusServerEarlyShutdown, Unknown},
|
||||||
|
{http.StatusBadRequest, Unhealthy},
|
||||||
|
{http.StatusBadGateway, Unhealthy},
|
||||||
|
{http.StatusInternalServerError, Unhealthy},
|
||||||
|
}
|
||||||
|
for _, healthCheckerTest := range healthCheckerTests {
|
||||||
|
tt := healthCheckerTest
|
||||||
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(tt.status)
|
||||||
|
}))
|
||||||
|
u, err := url.Parse(ts.URL)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
host, port, err := net.SplitHostPort(u.Host)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if tt.status == statusServerEarlyShutdown {
|
||||||
|
ts.Close()
|
||||||
|
}
|
||||||
|
container := api.Container{
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
HTTPGet: &api.HTTPGetProbe{
|
||||||
|
Port: util.MakeIntOrStringFromString(port),
|
||||||
|
Path: "/foo/bar",
|
||||||
|
Host: host,
|
||||||
|
},
|
||||||
|
Type: "http",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
hc := NewHealthChecker()
|
||||||
|
health, err := hc.HealthCheck(api.PodState{}, container)
|
||||||
|
if err != nil && tt.health != Unknown {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if health != tt.health {
|
||||||
|
t.Errorf("Expected %v, got %v", tt.health, health)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFindPortByName(t *testing.T) {
|
||||||
|
container := api.Container{
|
||||||
|
Ports: []api.Port{
|
||||||
|
{
|
||||||
|
Name: "foo",
|
||||||
|
HostPort: 8080,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "bar",
|
||||||
|
HostPort: 9000,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
want := 8080
|
||||||
|
got := findPortByName(container, "foo")
|
||||||
|
if got != want {
|
||||||
|
t.Errorf("Expected %v, got %v", want, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMuxHealthChecker(t *testing.T) {
|
||||||
|
muxHealthCheckerTests := []struct {
|
||||||
|
health Status
|
||||||
|
probeType string
|
||||||
|
}{
|
||||||
|
{Healthy, "http"},
|
||||||
|
{Unknown, "ftp"},
|
||||||
|
}
|
||||||
|
mc := &MuxHealthChecker{
|
||||||
|
checkers: make(map[string]HealthChecker),
|
||||||
|
}
|
||||||
|
hc := &HTTPHealthChecker{
|
||||||
|
client: &http.Client{},
|
||||||
|
}
|
||||||
|
mc.checkers["http"] = hc
|
||||||
|
for _, muxHealthCheckerTest := range muxHealthCheckerTests {
|
||||||
|
tt := muxHealthCheckerTest
|
||||||
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
u, err := url.Parse(ts.URL)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
host, port, err := net.SplitHostPort(u.Host)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
container := api.Container{
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
HTTPGet: &api.HTTPGetProbe{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
container.LivenessProbe.Type = tt.probeType
|
||||||
|
container.LivenessProbe.HTTPGet.Port = util.MakeIntOrStringFromString(port)
|
||||||
|
container.LivenessProbe.HTTPGet.Host = host
|
||||||
|
health, err := mc.HealthCheck(api.PodState{}, container)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if health != tt.health {
|
||||||
|
t.Errorf("Expected %v, got %v", tt.health, health)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,7 +18,6 @@ package health
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
@@ -27,40 +26,6 @@ import (
|
|||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HealthChecker defines an abstract interface for checking container health.
|
|
||||||
type HealthChecker interface {
|
|
||||||
HealthCheck(currentState api.PodState, container api.Container) (Status, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewHealthChecker creates a new HealthChecker which supports multiple types of liveness probes.
|
|
||||||
func NewHealthChecker() HealthChecker {
|
|
||||||
return &MuxHealthChecker{
|
|
||||||
checkers: map[string]HealthChecker{
|
|
||||||
"http": &HTTPHealthChecker{
|
|
||||||
client: &http.Client{},
|
|
||||||
},
|
|
||||||
"tcp": &TCPHealthChecker{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MuxHealthChecker bundles multiple implementations of HealthChecker of different types.
|
|
||||||
type MuxHealthChecker struct {
|
|
||||||
checkers map[string]HealthChecker
|
|
||||||
}
|
|
||||||
|
|
||||||
// HealthCheck delegates the health-checking of the container to one of the bundled implementations.
|
|
||||||
// It chooses an implementation according to container.LivenessProbe.Type.
|
|
||||||
// If there is no matching health checker it returns Unknown, nil.
|
|
||||||
func (m *MuxHealthChecker) HealthCheck(currentState api.PodState, container api.Container) (Status, error) {
|
|
||||||
checker, ok := m.checkers[container.LivenessProbe.Type]
|
|
||||||
if !ok || checker == nil {
|
|
||||||
glog.Warningf("Failed to find health checker for %s %s", container.Name, container.LivenessProbe.Type)
|
|
||||||
return Unknown, nil
|
|
||||||
}
|
|
||||||
return checker.HealthCheck(currentState, container)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HTTPGetInterface is an abstract interface for testability. It abstracts the interface of http.Client.Get.
|
// HTTPGetInterface is an abstract interface for testability. It abstracts the interface of http.Client.Get.
|
||||||
type HTTPGetInterface interface {
|
type HTTPGetInterface interface {
|
||||||
Get(url string) (*http.Response, error)
|
Get(url string) (*http.Response, error)
|
||||||
@@ -72,17 +37,6 @@ type HTTPHealthChecker struct {
|
|||||||
client HTTPGetInterface
|
client HTTPGetInterface
|
||||||
}
|
}
|
||||||
|
|
||||||
// A helper function to look up a port in a container by name.
|
|
||||||
// Returns the HostPort if found, -1 if not found.
|
|
||||||
func findPortByName(container api.Container, portName string) int {
|
|
||||||
for _, port := range container.Ports {
|
|
||||||
if port.Name == portName {
|
|
||||||
return port.HostPort
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the components of the target URL. For testability.
|
// Get the components of the target URL. For testability.
|
||||||
func getURLParts(currentState api.PodState, container api.Container) (string, int, string, error) {
|
func getURLParts(currentState api.PodState, container api.Container) (string, int, string, error) {
|
||||||
params := container.LivenessProbe.HTTPGet
|
params := container.LivenessProbe.HTTPGet
|
||||||
@@ -145,58 +99,3 @@ func (h *HTTPHealthChecker) HealthCheck(currentState api.PodState, container api
|
|||||||
}
|
}
|
||||||
return DoHTTPCheck(formatURL(host, port, path), h.client)
|
return DoHTTPCheck(formatURL(host, port, path), h.client)
|
||||||
}
|
}
|
||||||
|
|
||||||
type TCPHealthChecker struct{}
|
|
||||||
|
|
||||||
// Get the components of a TCP connection address. For testability.
|
|
||||||
func getTCPAddrParts(currentState api.PodState, container api.Container) (string, int, error) {
|
|
||||||
params := container.LivenessProbe.TCPSocket
|
|
||||||
if params == nil {
|
|
||||||
return "", -1, fmt.Errorf("error, no TCP parameters specified: %v", container)
|
|
||||||
}
|
|
||||||
port := -1
|
|
||||||
switch params.Port.Kind {
|
|
||||||
case util.IntstrInt:
|
|
||||||
port = params.Port.IntVal
|
|
||||||
case util.IntstrString:
|
|
||||||
port = findPortByName(container, params.Port.StrVal)
|
|
||||||
if port == -1 {
|
|
||||||
// Last ditch effort - maybe it was an int stored as string?
|
|
||||||
var err error
|
|
||||||
if port, err = strconv.Atoi(params.Port.StrVal); err != nil {
|
|
||||||
return "", -1, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if port == -1 {
|
|
||||||
return "", -1, fmt.Errorf("unknown port: %v", params.Port)
|
|
||||||
}
|
|
||||||
if len(currentState.PodIP) == 0 {
|
|
||||||
return "", -1, fmt.Errorf("no host specified.")
|
|
||||||
}
|
|
||||||
|
|
||||||
return currentState.PodIP, port, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// DoTCPCheck checks that a TCP socket to the address can be opened.
|
|
||||||
// If the socket can be opened, it returns Healthy.
|
|
||||||
// If the socket fails to open, it returns Unhealthy.
|
|
||||||
func DoTCPCheck(addr string) (Status, error) {
|
|
||||||
conn, err := net.Dial("tcp", addr)
|
|
||||||
if err != nil {
|
|
||||||
return Unhealthy, nil
|
|
||||||
}
|
|
||||||
err = conn.Close()
|
|
||||||
if err != nil {
|
|
||||||
glog.Errorf("unexpected error closing health check socket: %v (%#v)", err, err)
|
|
||||||
}
|
|
||||||
return Healthy, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *TCPHealthChecker) HealthCheck(currentState api.PodState, container api.Container) (Status, error) {
|
|
||||||
host, port, err := getTCPAddrParts(currentState, container)
|
|
||||||
if err != nil {
|
|
||||||
return Unknown, err
|
|
||||||
}
|
|
||||||
return DoTCPCheck(net.JoinHostPort(host, strconv.Itoa(port)))
|
|
||||||
}
|
|
||||||
139
pkg/health/http_test.go
Normal file
139
pkg/health/http_test.go
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2014 Google Inc. All rights reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGetURLParts(t *testing.T) {
|
||||||
|
testCases := []struct {
|
||||||
|
probe *api.HTTPGetProbe
|
||||||
|
ok bool
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
path string
|
||||||
|
}{
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromInt(-1), Path: ""}, false, "", -1, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString(""), Path: ""}, false, "", -1, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("-1"), Path: ""}, false, "", -1, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("not-found"), Path: ""}, false, "", -1, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("found"), Path: ""}, true, "127.0.0.1", 93, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromInt(76), Path: ""}, true, "127.0.0.1", 76, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "", Port: util.MakeIntOrStringFromString("118"), Path: ""}, true, "127.0.0.1", 118, ""},
|
||||||
|
{&api.HTTPGetProbe{Host: "hostname", Port: util.MakeIntOrStringFromInt(76), Path: "path"}, true, "hostname", 76, "path"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range testCases {
|
||||||
|
state := api.PodState{PodIP: "127.0.0.1"}
|
||||||
|
container := api.Container{
|
||||||
|
Ports: []api.Port{{Name: "found", HostPort: 93}},
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
HTTPGet: test.probe,
|
||||||
|
Type: "http",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
host, port, path, err := getURLParts(state, container)
|
||||||
|
if !test.ok && err == nil {
|
||||||
|
t.Errorf("Expected error for %+v, got %s:%d/%s", test, host, port, path)
|
||||||
|
}
|
||||||
|
if test.ok && err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if test.ok {
|
||||||
|
if host != test.host || port != test.port || path != test.path {
|
||||||
|
t.Errorf("Expected %s:%d/%s, got %s:%d/%s",
|
||||||
|
test.host, test.port, test.path, host, port, path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFormatURL(t *testing.T) {
|
||||||
|
testCases := []struct {
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
path string
|
||||||
|
result string
|
||||||
|
}{
|
||||||
|
{"localhost", 93, "", "http://localhost:93"},
|
||||||
|
{"localhost", 93, "/path", "http://localhost:93/path"},
|
||||||
|
}
|
||||||
|
for _, test := range testCases {
|
||||||
|
url := formatURL(test.host, test.port, test.path)
|
||||||
|
if url != test.result {
|
||||||
|
t.Errorf("Expected %s, got %s", test.result, url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHTTPHealthChecker(t *testing.T) {
|
||||||
|
testCases := []struct {
|
||||||
|
probe *api.HTTPGetProbe
|
||||||
|
status int
|
||||||
|
health Status
|
||||||
|
}{
|
||||||
|
// The probe will be filled in below. This is primarily testing that an HTTP GET happens.
|
||||||
|
{&api.HTTPGetProbe{}, http.StatusOK, Healthy},
|
||||||
|
{&api.HTTPGetProbe{}, -1, Unhealthy},
|
||||||
|
{nil, -1, Unknown},
|
||||||
|
}
|
||||||
|
hc := &HTTPHealthChecker{
|
||||||
|
client: &http.Client{},
|
||||||
|
}
|
||||||
|
for _, test := range testCases {
|
||||||
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(test.status)
|
||||||
|
}))
|
||||||
|
u, err := url.Parse(ts.URL)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
host, port, err := net.SplitHostPort(u.Host)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
container := api.Container{
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
HTTPGet: test.probe,
|
||||||
|
Type: "http",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
params := container.LivenessProbe.HTTPGet
|
||||||
|
if params != nil {
|
||||||
|
params.Port = util.MakeIntOrStringFromString(port)
|
||||||
|
params.Host = host
|
||||||
|
}
|
||||||
|
health, err := hc.HealthCheck(api.PodState{PodIP: host}, container)
|
||||||
|
if test.health == Unknown && err == nil {
|
||||||
|
t.Errorf("Expected error")
|
||||||
|
}
|
||||||
|
if test.health != Unknown && err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if health != test.health {
|
||||||
|
t.Errorf("Expected %v, got %v", test.health, health)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
82
pkg/health/tcp.go
Normal file
82
pkg/health/tcp.go
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2014 Google Inc. All rights reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
|
"github.com/golang/glog"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TCPHealthChecker struct{}
|
||||||
|
|
||||||
|
// Get the components of a TCP connection address. For testability.
|
||||||
|
func getTCPAddrParts(currentState api.PodState, container api.Container) (string, int, error) {
|
||||||
|
params := container.LivenessProbe.TCPSocket
|
||||||
|
if params == nil {
|
||||||
|
return "", -1, fmt.Errorf("error, no TCP parameters specified: %v", container)
|
||||||
|
}
|
||||||
|
port := -1
|
||||||
|
switch params.Port.Kind {
|
||||||
|
case util.IntstrInt:
|
||||||
|
port = params.Port.IntVal
|
||||||
|
case util.IntstrString:
|
||||||
|
port = findPortByName(container, params.Port.StrVal)
|
||||||
|
if port == -1 {
|
||||||
|
// Last ditch effort - maybe it was an int stored as string?
|
||||||
|
var err error
|
||||||
|
if port, err = strconv.Atoi(params.Port.StrVal); err != nil {
|
||||||
|
return "", -1, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if port == -1 {
|
||||||
|
return "", -1, fmt.Errorf("unknown port: %v", params.Port)
|
||||||
|
}
|
||||||
|
if len(currentState.PodIP) == 0 {
|
||||||
|
return "", -1, fmt.Errorf("no host specified.")
|
||||||
|
}
|
||||||
|
|
||||||
|
return currentState.PodIP, port, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// DoTCPCheck checks that a TCP socket to the address can be opened.
|
||||||
|
// If the socket can be opened, it returns Healthy.
|
||||||
|
// If the socket fails to open, it returns Unhealthy.
|
||||||
|
func DoTCPCheck(addr string) (Status, error) {
|
||||||
|
conn, err := net.Dial("tcp", addr)
|
||||||
|
if err != nil {
|
||||||
|
return Unhealthy, nil
|
||||||
|
}
|
||||||
|
err = conn.Close()
|
||||||
|
if err != nil {
|
||||||
|
glog.Errorf("unexpected error closing health check socket: %v (%#v)", err, err)
|
||||||
|
}
|
||||||
|
return Healthy, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *TCPHealthChecker) HealthCheck(currentState api.PodState, container api.Container) (Status, error) {
|
||||||
|
host, port, err := getTCPAddrParts(currentState, container)
|
||||||
|
if err != nil {
|
||||||
|
return Unknown, err
|
||||||
|
}
|
||||||
|
return DoTCPCheck(net.JoinHostPort(host, strconv.Itoa(port)))
|
||||||
|
}
|
||||||
116
pkg/health/tcp_test.go
Normal file
116
pkg/health/tcp_test.go
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2014 Google Inc. All rights reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package health
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGetTCPAddrParts(t *testing.T) {
|
||||||
|
testCases := []struct {
|
||||||
|
probe *api.TCPSocketProbe
|
||||||
|
ok bool
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
}{
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromInt(-1)}, false, "", -1},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("")}, false, "", -1},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("-1")}, false, "", -1},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("not-found")}, false, "", -1},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("found")}, true, "1.2.3.4", 93},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromInt(76)}, true, "1.2.3.4", 76},
|
||||||
|
{&api.TCPSocketProbe{Port: util.MakeIntOrStringFromString("118")}, true, "1.2.3.4", 118},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range testCases {
|
||||||
|
state := api.PodState{PodIP: "1.2.3.4"}
|
||||||
|
container := api.Container{
|
||||||
|
Ports: []api.Port{{Name: "found", HostPort: 93}},
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
TCPSocket: test.probe,
|
||||||
|
Type: "tcp",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
host, port, err := getTCPAddrParts(state, container)
|
||||||
|
if !test.ok && err == nil {
|
||||||
|
t.Errorf("Expected error for %+v, got %s:%d", test, host, port)
|
||||||
|
}
|
||||||
|
if test.ok && err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if test.ok {
|
||||||
|
if host != test.host || port != test.port {
|
||||||
|
t.Errorf("Expected %s:%d, got %s:%d", test.host, test.port, host, port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTcpHealthChecker(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
probe *api.TCPSocketProbe
|
||||||
|
expectedStatus Status
|
||||||
|
expectError bool
|
||||||
|
}{
|
||||||
|
// The probe will be filled in below. This is primarily testing that a connection is made.
|
||||||
|
{&api.TCPSocketProbe{}, Healthy, false},
|
||||||
|
{&api.TCPSocketProbe{}, Unhealthy, false},
|
||||||
|
{nil, Unknown, true},
|
||||||
|
}
|
||||||
|
|
||||||
|
checker := &TCPHealthChecker{}
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
u, err := url.Parse(server.URL)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
host, port, err := net.SplitHostPort(u.Host)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
for _, test := range tests {
|
||||||
|
container := api.Container{
|
||||||
|
LivenessProbe: &api.LivenessProbe{
|
||||||
|
TCPSocket: test.probe,
|
||||||
|
Type: "tcp",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
params := container.LivenessProbe.TCPSocket
|
||||||
|
if params != nil && test.expectedStatus == Healthy {
|
||||||
|
params.Port = util.MakeIntOrStringFromString(port)
|
||||||
|
}
|
||||||
|
status, err := checker.HealthCheck(api.PodState{PodIP: host}, container)
|
||||||
|
if status != test.expectedStatus {
|
||||||
|
t.Errorf("expected: %v, got: %v", test.expectedStatus, status)
|
||||||
|
}
|
||||||
|
if err != nil && !test.expectError {
|
||||||
|
t.Errorf("unexpected error: %#v", err)
|
||||||
|
}
|
||||||
|
if err == nil && test.expectError {
|
||||||
|
t.Errorf("unexpected non-error.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user