From 310ab8c3c4a2556594578ca6cb65941309d1840b Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Tue, 14 Nov 2017 09:55:34 +0100 Subject: [PATCH] Do not crash on empty NODE_NAMES array. --- cluster/log-dump/log-dump.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index 13c12e1a957..ab3b8b1ab2e 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -219,7 +219,7 @@ function dump_masters() { } function dump_nodes() { - local node_names + local node_names=() if [[ -n "${1:-}" ]]; then echo "Dumping logs for nodes provided as args to dump_nodes() function" node_names=( "$@" ) @@ -232,7 +232,9 @@ function dump_nodes() { else echo "Detecting nodes in the cluster" detect-node-names &> /dev/null - node_names=( "${NODE_NAMES[@]}" ) + if [[ -n "${NODE_NAMES:-}" ]]; then + node_names=( "${NODE_NAMES[@]}" ) + fi fi if [[ "${#node_names[@]}" == 0 ]]; then @@ -283,7 +285,7 @@ function dump_nodes_with_logexporter() { echo "Detecting nodes in the cluster" detect-node-names &> /dev/null - if [[ "${#NODE_NAMES[@]}" == 0 ]]; then + if [[ -z "${NODE_NAMES:-}" ]]; then echo "No nodes found!" return fi