github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Switch exec to look at exit code not output status.

Browse Source
This commit is contained in:
Brendan Burns
2015-05-08 09:48:31 -07:00
parent 35c644a45f
commit c9324e6e38
8 changed files with 98 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/probe/exec/exec.go
View File

@@ -17,34 +17,35 @@ limitations under the License.
package exec
import (
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/probe"
uexec "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
"github.com/golang/glog"
)
const defaultHealthyOutput = "ok"
func New() ExecProber {
return execProber{}
}
type ExecProber interface {
Probe(e uexec.Cmd) (probe.Result, error)
Probe(e exec.Cmd) (probe.Result, error)
}
type execProber struct{}
func (pr execProber) Probe(e uexec.Cmd) (probe.Result, error) {
func (pr execProber) Probe(e exec.Cmd) (probe.Result, error) {
data, err := e.CombinedOutput()
glog.V(4).Infof("health check response: %s", string(data))
if err != nil {
exit, ok := err.(exec.ExitError)
if ok {
if exit.ExitStatus() == 0 {
return probe.Success, nil
} else {
return probe.Failure, nil
}
}
return probe.Unknown, err
}
if !strings.HasPrefix(strings.ToLower(string(data)), defaultHealthyOutput) {
return probe.Failure, nil
}
return probe.Success, nil
}