github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 21:30:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix the output of health-mointor.sh

Browse Source 
The script show prints the errors/response of the health check, but not
show the progress of `curl`.
This commit is contained in:
Yu-Ju Hong
2017-02-15 17:30:42 -08:00
parent e73e25422f
commit d3e24e1085
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/container-linux/health-monitor.sh
View File

@@ -42,10 +42,12 @@ function kubelet_monitoring {
# TODO(andyzheng0831): replace it with a more reliable method if possible. # TODO(andyzheng0831): replace it with a more reliable method if possible.
sleep 120 sleep 120
local -r max_seconds=10 local -r max_seconds=10
local output=""
while [ 1 ]; do while [ 1 ]; do
if ! curl --insecure -m "${max_seconds}" -f -s https://127.0.0.1:${KUBELET_PORT:-10250}/healthz > /dev/null; then if ! output=$(curl --insecure -m "${max_seconds}" -f -s -S https://127.0.0.1:${KUBELET_PORT:-10250}/healthz 2>&1); then
# Print the response and/or errors.
echo $output
echo "Kubelet is unhealthy!" echo "Kubelet is unhealthy!"
curl --insecure https://127.0.0.1:${KUBELET_PORT:-10250}/healthz
pkill kubelet pkill kubelet
# Wait for a while, as we don't want to kill it again before it is really up. # Wait for a while, as we don't want to kill it again before it is really up.
sleep 60 sleep 60

6
cluster/gce/gci/health-monitor.sh
View File

@@ -42,10 +42,12 @@ function kubelet_monitoring {
# TODO(andyzheng0831): replace it with a more reliable method if possible. # TODO(andyzheng0831): replace it with a more reliable method if possible.
sleep 120 sleep 120
local -r max_seconds=10 local -r max_seconds=10
local output=""
while [ 1 ]; do while [ 1 ]; do
if ! curl -m "${max_seconds}" -f -s http://127.0.0.1:10255/healthz > /dev/null; then if ! output=$(curl -m "${max_seconds}" -f -s -S http://127.0.0.1:10255/healthz 2>&1); then
# Print the response and/or errors.
echo $output
echo "Kubelet is unhealthy!" echo "Kubelet is unhealthy!"
curl http://127.0.0.1:10255/healthz
pkill kubelet pkill kubelet
# Wait for a while, as we don't want to kill it again before it is really up. # Wait for a while, as we don't want to kill it again before it is really up.
sleep 60 sleep 60