From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 6 Nov 2019 15:01:25 +0000 (+0100)
Subject: qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set
X-Git-Tag: v15.1.0~1018^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a004d92ae0d65170a8c10dbca890dd37b5a218a3;p=ceph.git

qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set

When running test_ceph_daemon.sh from the root dir and not setting
$CEPH_DAEMON manually, the call hangs at:

$ ./qa/standalone/test_ceph_daemon.sh
[...]
+ for p in $PYTHONS
+ echo '=== re-running with python3 ==='
=== re-running with python3 ===
++ which python3
+ ln -s /usr/bin/python3 /tmp/tmp.6hneCsNMio/python
+ echo '#!/tmp/tmp.6hneCsNMio/python'
+ cat

Check that there is a ceph-daemon found before continue.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
---

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 1149db69fd0..18ad8cd590c 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -11,6 +11,12 @@ if [ -z "$CEPH_DAEMON" ]; then
     which ceph-daemon && CEPH_DAEMON=$(which ceph-daemon)
 fi
 
+# at this point, we need $CEPH_DAEMON set
+if [ -z "$CEPH_DAEMON" ]; then
+    echo "ceph-daemon not found.Please set \$CEPH_DAEMON"
+    exit 1
+fi
+
 # respawn ourselves with a shebang
 PYTHONS="python3 python2"  # which pythons we test
 if [ -z "$PYTHON_KLUDGE" ]; then