From: Milind Changire <mchangir@redhat.com>
Date: Mon, 11 Nov 2019 14:58:17 +0000 (+0530)
Subject: vstart.sh: highlight presence of stray conf
X-Git-Tag: v15.1.0~638^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31403%2Fhead;p=ceph.git

vstart.sh: highlight presence of stray conf

If there's a stray conf file present in /etc/ceph/ceph.conf,
then it leads to a misbehaving cluster.
Probably an unresponsive cluster as well.

Fixes: https://tracker.ceph.com/issues/42643
Signed-off-by: Milind Changire <mchangir@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 8b630110f9c2..dc06adbfec3c 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1412,3 +1412,16 @@ echo ""
 
 echo "CEPH_DEV=1"
 
+# always keep this section at the very bottom of this file
+STRAY_CONF_PATH="/etc/ceph/ceph.conf"
+if [ -f "$STRAY_CONF_PATH" -a -n "$conf_fn" -a ! "$conf_fn" -ef "$STRAY_CONF_PATH" ]; then
+    echo ""
+    echo ""
+    echo "WARNING:"
+    echo "    Please remove stray $STRAY_CONF_PATH if not needed."
+    echo "    Your conf files $conf_fn and $STRAY_CONF_PATH may not be in sync"
+    echo "    and may lead to undesired results."
+    echo ""
+    echo "NOTE:"
+    echo "    Remember to restart cluster after removing $STRAY_CONF_PATH"
+fi