github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

create separate transports for liveness and readiness probes

Browse Source
This commit is contained in:
Seth Jennings
2017-10-01 21:45:43 -05:00
parent e51752239c
commit 343036e350
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubelet/prober/prober.go
View File

@@ -47,7 +47,11 @@ const maxProbeRetries = 3
// Prober helps to check the liveness/readiness of a container. // Prober helps to check the liveness/readiness of a container.
type prober struct { type prober struct {
exec execprobe.ExecProber exec execprobe.ExecProber
http httprobe.HTTPProber // probe types needs different httprobe instances so they don't
// share a connection pool which can cause collsions to the
// same host:port and transient failures. See #49740.
readinessHttp httprobe.HTTPProber
livenessHttp httprobe.HTTPProber
tcp tcprobe.TCPProber tcp tcprobe.TCPProber
runner kubecontainer.ContainerCommandRunner runner kubecontainer.ContainerCommandRunner
@@ -64,7 +68,8 @@ func newProber(
return &prober{ return &prober{
exec: execprobe.New(), exec: execprobe.New(),
http: httprobe.New(), readinessHttp: httprobe.New(),
livenessHttp: httprobe.New(),
tcp: tcprobe.New(), tcp: tcprobe.New(),
runner: runner, runner: runner,
refManager: refManager, refManager: refManager,
@@ -90,7 +95,7 @@ func (pb *prober) probe(probeType probeType, pod *v1.Pod, status v1.PodStatus, c
return results.Success, nil return results.Success, nil
} }
result, output, err := pb.runProbeWithRetries(probeSpec, pod, status, container, containerID, maxProbeRetries) result, output, err := pb.runProbeWithRetries(probeType, probeSpec, pod, status, container, containerID, maxProbeRetries)
if err != nil || result != probe.Success { if err != nil || result != probe.Success {
// Probe failed in one way or another. // Probe failed in one way or another.
ref, hasRef := pb.refManager.GetRef(containerID) ref, hasRef := pb.refManager.GetRef(containerID)
@@ -116,12 +121,12 @@ func (pb *prober) probe(probeType probeType, pod *v1.Pod, status v1.PodStatus, c
// runProbeWithRetries tries to probe the container in a finite loop, it returns the last result // runProbeWithRetries tries to probe the container in a finite loop, it returns the last result
// if it never succeeds. // if it never succeeds.
func (pb *prober) runProbeWithRetries(p *v1.Probe, pod *v1.Pod, status v1.PodStatus, container v1.Container, containerID kubecontainer.ContainerID, retries int) (probe.Result, string, error) { func (pb *prober) runProbeWithRetries(probeType probeType, p *v1.Probe, pod *v1.Pod, status v1.PodStatus, container v1.Container, containerID kubecontainer.ContainerID, retries int) (probe.Result, string, error) {
var err error var err error
var result probe.Result var result probe.Result
var output string var output string
for i := 0; i < retries; i++ { for i := 0; i < retries; i++ {
result, output, err = pb.runProbe(p, pod, status, container, containerID) result, output, err = pb.runProbe(probeType, p, pod, status, container, containerID)
if err == nil { if err == nil {
return result, output, nil return result, output, nil
} }
@@ -139,7 +144,7 @@ func buildHeader(headerList []v1.HTTPHeader) http.Header {
return headers return headers
} }
func (pb *prober) runProbe(p *v1.Probe, pod *v1.Pod, status v1.PodStatus, container v1.Container, containerID kubecontainer.ContainerID) (probe.Result, string, error) { func (pb *prober) runProbe(probeType probeType, p *v1.Probe, pod *v1.Pod, status v1.PodStatus, container v1.Container, containerID kubecontainer.ContainerID) (probe.Result, string, error) {
timeout := time.Duration(p.TimeoutSeconds) * time.Second timeout := time.Duration(p.TimeoutSeconds) * time.Second
if p.Exec != nil { if p.Exec != nil {
glog.V(4).Infof("Exec-Probe Pod: %v, Container: %v, Command: %v", pod, container, p.Exec.Command) glog.V(4).Infof("Exec-Probe Pod: %v, Container: %v, Command: %v", pod, container, p.Exec.Command)
@@ -161,7 +166,11 @@ func (pb *prober) runProbe(p *v1.Probe, pod *v1.Pod, status v1.PodStatus, contai
url := formatURL(scheme, host, port, path) url := formatURL(scheme, host, port, path)
headers := buildHeader(p.HTTPGet.HTTPHeaders) headers := buildHeader(p.HTTPGet.HTTPHeaders)
glog.V(4).Infof("HTTP-Probe Headers: %v", headers) glog.V(4).Infof("HTTP-Probe Headers: %v", headers)
return pb.http.Probe(url, headers, timeout) if probeType == liveness {
return pb.livenessHttp.Probe(url, headers, timeout)
} else { // readiness
return pb.readinessHttp.Probe(url, headers, timeout)
}
} }
if p.TCPSocket != nil { if p.TCPSocket != nil {
port, err := extractPort(p.TCPSocket.Port, container) port, err := extractPort(p.TCPSocket.Port, container)