mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #65374 from jpeeler/warning-timestamp
Automatic merge from submit-queue (batch tested with PRs 60150, 65467, 65487, 65595, 65374). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add warning function that includes timestamp Knowing when a process has terminated is helpful when looking through log files. The scenario that happened to me was that /tmp filled up, so as expected things failed. But I'd really like to know when things got bad without looking through 10G log files. Release note: ```release-note NONE ```
This commit is contained in:
commit
f0c89c00a0
@ -397,12 +397,12 @@ cleanup()
|
|||||||
# a process dies unexpectedly.
|
# a process dies unexpectedly.
|
||||||
function healthcheck {
|
function healthcheck {
|
||||||
if [[ -n "${APISERVER_PID-}" ]] && ! sudo kill -0 ${APISERVER_PID} 2>/dev/null; then
|
if [[ -n "${APISERVER_PID-}" ]] && ! sudo kill -0 ${APISERVER_PID} 2>/dev/null; then
|
||||||
warning "API server terminated unexpectedly, see ${APISERVER_LOG}"
|
warning_log "API server terminated unexpectedly, see ${APISERVER_LOG}"
|
||||||
APISERVER_PID=
|
APISERVER_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${CTLRMGR_PID-}" ]] && ! sudo kill -0 ${CTLRMGR_PID} 2>/dev/null; then
|
if [[ -n "${CTLRMGR_PID-}" ]] && ! sudo kill -0 ${CTLRMGR_PID} 2>/dev/null; then
|
||||||
warning "kube-controller-manager terminated unexpectedly, see ${CTLRMGR_LOG}"
|
warning_log "kube-controller-manager terminated unexpectedly, see ${CTLRMGR_LOG}"
|
||||||
CTLRMGR_PID=
|
CTLRMGR_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -410,32 +410,37 @@ function healthcheck {
|
|||||||
# TODO (https://github.com/kubernetes/kubernetes/issues/62474): check health also in this case
|
# TODO (https://github.com/kubernetes/kubernetes/issues/62474): check health also in this case
|
||||||
:
|
:
|
||||||
elif [[ -n "${KUBELET_PID-}" ]] && ! sudo kill -0 ${KUBELET_PID} 2>/dev/null; then
|
elif [[ -n "${KUBELET_PID-}" ]] && ! sudo kill -0 ${KUBELET_PID} 2>/dev/null; then
|
||||||
warning "kubelet terminated unexpectedly, see ${KUBELET_LOG}"
|
warning_log "kubelet terminated unexpectedly, see ${KUBELET_LOG}"
|
||||||
KUBELET_PID=
|
KUBELET_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${PROXY_PID-}" ]] && ! sudo kill -0 ${PROXY_PID} 2>/dev/null; then
|
if [[ -n "${PROXY_PID-}" ]] && ! sudo kill -0 ${PROXY_PID} 2>/dev/null; then
|
||||||
warning "kube-proxy terminated unexpectedly, see ${PROXY_LOG}"
|
warning_log "kube-proxy terminated unexpectedly, see ${PROXY_LOG}"
|
||||||
PROXY_PID=
|
PROXY_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${SCHEDULER_PID-}" ]] && ! sudo kill -0 ${SCHEDULER_PID} 2>/dev/null; then
|
if [[ -n "${SCHEDULER_PID-}" ]] && ! sudo kill -0 ${SCHEDULER_PID} 2>/dev/null; then
|
||||||
warning "scheduler terminated unexpectedly, see ${SCHEDULER_LOG}"
|
warning_log "scheduler terminated unexpectedly, see ${SCHEDULER_LOG}"
|
||||||
SCHEDULER_PID=
|
SCHEDULER_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${ETCD_PID-}" ]] && ! sudo kill -0 ${ETCD_PID} 2>/dev/null; then
|
if [[ -n "${ETCD_PID-}" ]] && ! sudo kill -0 ${ETCD_PID} 2>/dev/null; then
|
||||||
warning "etcd terminated unexpectedly"
|
warning_log "etcd terminated unexpectedly"
|
||||||
ETCD_PID=
|
ETCD_PID=
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function warning {
|
function print_color {
|
||||||
message=$1
|
message=$1
|
||||||
|
prefix=${2:+$2: } # add colon only if defined
|
||||||
|
color=${3:-1} # default is red
|
||||||
|
echo -n $(tput bold)$(tput setaf ${color})
|
||||||
|
echo "${prefix}${message}"
|
||||||
|
echo -n $(tput sgr0)
|
||||||
|
}
|
||||||
|
|
||||||
echo $(tput bold)$(tput setaf 1)
|
function warning_log {
|
||||||
echo "WARNING: ${message}"
|
print_color "$1" "W$(date "+%m%d %H:%M:%S")]" 1
|
||||||
echo $(tput sgr0)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function start_etcd {
|
function start_etcd {
|
||||||
@ -1073,14 +1078,14 @@ if [[ "${START_MODE}" != "nokubelet" ]]; then
|
|||||||
# Detect the OS name/arch and display appropriate error.
|
# Detect the OS name/arch and display appropriate error.
|
||||||
case "$(uname -s)" in
|
case "$(uname -s)" in
|
||||||
Darwin)
|
Darwin)
|
||||||
warning "kubelet is not currently supported in darwin, kubelet aborted."
|
print_color "kubelet is not currently supported in darwin, kubelet aborted."
|
||||||
KUBELET_LOG=""
|
KUBELET_LOG=""
|
||||||
;;
|
;;
|
||||||
Linux)
|
Linux)
|
||||||
start_kubelet
|
start_kubelet
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
warning "Unsupported host OS. Must be Linux or Mac OS X, kubelet aborted."
|
print_color "Unsupported host OS. Must be Linux or Mac OS X, kubelet aborted."
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user