From 6d59480a70f0e51da519c01cca6a1ce831b92514 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 30 Oct 2023 11:26:30 -0400 Subject: [PATCH] Try a single gcloud command for scp-ing all files Signed-off-by: Davanum Srinivas --- cluster/log-dump/log-dump.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index 66fac0f74e1..03049ca0e3b 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -139,10 +139,11 @@ function copy-logs-from-node() { if [[ "${gcloud_supported_providers}" =~ ${KUBERNETES_PROVIDER} ]]; then # get-serial-port-output lets you ask for ports 1-4, but currently (11/21/2016) only port 1 contains useful information gcloud compute instances get-serial-port-output --project "${PROJECT}" --zone "${ZONE}" --port 1 "${node}" > "${dir}/serial-1.log" || true - # FIXME(dims): bug in gcloud prevents multiple source files specified using curly braces, so we just loop through for now + source_file_args=() for single_file in "${files[@]}"; do - gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${node}:${single_file}" "${dir}" > /dev/null || true + source_file_args+=( "${node}:${single_file}" ) done + gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${source_file_args[@]}" "${dir}" > /dev/null || true elif [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then local ip ip=$(get_ssh_hostname "${node}")