From 7e26083d9262e54e9646cf6a73da4e0f3b807702 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 8 Apr 2020 13:35:02 -0600 Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: use fsid during dump_log needed when running with multiple ceph clusters Signed-off-by: Michael Fritch --- qa/workunits/cephadm/test_cephadm.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index c3be38eb6b1..ac9c922a97c 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -14,7 +14,7 @@ TMPDIR=$(mktemp -d) function cleanup() { - dump_all_logs + dump_all_logs $FSID rm -rf $TMPDIR } trap cleanup EXIT @@ -114,8 +114,9 @@ function is_available() function dump_log() { - local name="$1" - local num_lines="$2" + local fsid="$1" + local name="$2" + local num_lines="$3" if [ -z $num_lines ]; then num_lines=100 @@ -125,16 +126,17 @@ function dump_log() echo 'dump daemon log:' $name echo '-------------------------' - $CEPHADM logs --name $name -- --no-pager -n $num_lines + $CEPHADM logs --fsid $fsid --name $name -- --no-pager -n $num_lines } function dump_all_logs() { - names=$($CEPHADM ls | jq -r '.[].name') + local fsid="$1" + local names=$($CEPHADM ls | jq -r '.[] | select(.fsid == "'$fsid'").name') echo 'dumping logs for daemons: ' $names for name in $names; do - dump_log $name + dump_log $fsid $name done } -- 2.47.3