From 0316faba9d7497156451003c93405425b3cda13e Mon Sep 17 00:00:00 2001 From: wojtekt Date: Mon, 2 Jul 2018 11:22:14 +0200 Subject: [PATCH] Fix dumping logs with logexporter --- cluster/log-dump/log-dump.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index 5e90a205b2d..c4f3781a912 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -365,10 +365,14 @@ function dump_nodes_with_logexporter() { done failed_nodes=() - for node in "${NON_LOGEXPORTED_NODES[@]:-}"; do - echo "Logexporter didn't succeed on node ${node}. Queuing it for logdump through SSH." - failed_nodes+=("${node}") - done + # The following if is needed, because defaulting for empty arrays + # seems to treat them as non-empty with single empty string. + if [[ -n "${NON_LOGEXPORTED_NODES:-}" ]]; then + for node in "${NON_LOGEXPORTED_NODES[@]:-}"; do + echo "Logexporter didn't succeed on node ${node}. Queuing it for logdump through SSH." + failed_nodes+=("${node}") + done + fi # Delete the logexporter resources and dump logs for the failed nodes (if any) through SSH. "${KUBECTL}" get pods --namespace "${logexporter_namespace}" || true