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

Merge pull request #89825 from tosi3k/log-dump-ssh-timeout

Browse Source 
Enable timeout for SSH-ing to non-logexported nodes
This commit is contained in:
Kubernetes Prow Robot 2020-04-06 07:15:46 -07:00 committed by GitHub
commit c158001bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,6 +420,12 @@ function dump_nodes() {
all_selected_nodes+=( "${windows_node_names[@]}" ) all_selected_nodes+=( "${windows_node_names[@]}" )
proc=${max_dump_processes} proc=${max_dump_processes}
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}"
@ -439,6 +445,11 @@ function dump_nodes() {
if [[ proc -eq 0 ]]; then if [[ proc -eq 0 ]]; then
proc=${max_dump_processes} proc=${max_dump_processes}
wait wait
now="$(date +%s)"
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
fi
fi fi
done done
# Wait for any remaining processes. # Wait for any remaining processes.