From 11b0eed9e7fc3b3211426aa42f55ab62f2c62e27 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 15 Oct 2023 16:57:24 -0400 Subject: [PATCH] Work around bug in gcloud when downloading logs Signed-off-by: Davanum Srinivas --- cluster/log-dump/log-dump.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index d326747590a..66fac0f74e1 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -139,7 +139,10 @@ 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 - gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true + # FIXME(dims): bug in gcloud prevents multiple source files specified using curly braces, so we just loop through for now + for single_file in "${files[@]}"; do + gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${node}:${single_file}" "${dir}" > /dev/null || true + done elif [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then local ip ip=$(get_ssh_hostname "${node}")