github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Apply PR fixes

Browse Source
This commit is contained in:
Antoni Zawodny 2020-04-06 10:06:51 +02:00
parent 6e34409f2b
commit 15160168e5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/log-dump/log-dump.sh
View File

@ -420,6 +420,11 @@ function dump_nodes() {
proc=${max_dump_processes} proc=${max_dump_processes}
start="$(date +%s)" start="$(date +%s)"
# log_dump_ssh_timeout is the maximal number of seconds the log dumping over
# SSH operation can take. Please note that the logic enforcing the timeout
# is only a best effort. The actual time of the operation may be longer
# due to waiting for all the child processes below.
log_dump_ssh_timeout_seconds="${LOG_DUMP_SSH_TIMEOUT_SECONDS:-}"
for i in "${!all_selected_nodes[@]}"; do for i in "${!all_selected_nodes[@]}"; do
node_name="${all_selected_nodes[$i]}" node_name="${all_selected_nodes[$i]}"
node_dir="${report_dir}/${node_name}" node_dir="${report_dir}/${node_name}"
@ -440,7 +445,8 @@ function dump_nodes() {
proc=${max_dump_processes} proc=${max_dump_processes}
wait wait
now="$(date +%s)" now="$(date +%s)"
if [[ ! -z "${LOG_DUMP_SSH_TIMEOUT}" && $((now - start)) -gt ${LOG_DUMP_SSH_TIMEOUT} ]]; then if [[ -n "${log_dump_ssh_timeout_seconds}" && $((now - start)) -gt ${log_dump_ssh_timeout_seconds} ]]; then
echo "WARNING: Hit timeout after ${log_dump_ssh_timeout_seconds} seconds, finishing log dumping over SSH shortly"
break break
fi fi
fi fi