Merge PR #33634 into master

* refs/pull/33634/head:
	qa/workunits/cephadm/test_cephadm.sh: dump logs on exit
	qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function

Reviewed-by: Sage Weil <sage@redhat.com>

qa/workunits/cephadm/test_cephadm.sh

@@ -11,7 +11,13 @@ IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'}
 IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'}
 
 TMPDIR=$(mktemp -d)
-trap "rm -rf $TMPDIR" EXIT
+
+function cleanup()
+{
+    dump_all_logs
+    rm -rf $TMPDIR
+}
+trap cleanup EXIT
 
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
 OSD_IMAGE_SIZE='6G'
@@ -106,6 +112,32 @@ function is_available()
     true
 }
 
+function dump_log()
+{
+    local name="$1"
+    local num_lines="$2"
+
+    if [ -z $num_lines ]; then
+        num_lines=100
+    fi
+
+    echo '-------------------------'
+    echo 'dump daemon log:' $name
+    echo '-------------------------'
+
+    $CEPHADM logs --name $name -- --no-pager -n $num_lines
+}
+
+function dump_all_logs()
+{
+    names=$($CEPHADM ls | jq -r '.[].name')
+
+    echo 'dumping logs for daemons: ' $names
+    for name in $names; do
+        dump_log $name
+    done
+}
+
 ## prepare + check host
 $SUDO $CEPHADM check-host