From: Kefu Chai <kchai@redhat.com>
Date: Sat, 25 Jul 2020 07:45:26 +0000 (+0800)
Subject: stop.sh: stop osd before mon
X-Git-Tag: wip-pdonnell-testing-20200918.022351~556^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c551da852716da6957892b824067ddacf799ba3f;p=ceph-ci.git

stop.sh: stop osd before mon

osd sends a MOSDMarkMeDown message to monitor and waits for its ack
before timeout, so if we can stop osd before stopping mon, stop.sh can
return sooner without waiting until the timeout.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/stop.sh b/src/stop.sh
index 4afc7bcdbe3..e736cb9f232 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -161,7 +161,7 @@ if [ $stop_all -eq 1 ]; then
         do_killcephadm
     fi
 
-    for p in ceph-mon ceph-mds $ceph_osd ceph-mgr radosgw lt-radosgw apache2 ganesha.nfsd ; do
+    for p in $ceph_osd ceph-mon ceph-mds ceph-mgr radosgw lt-radosgw apache2 ganesha.nfsd ; do
         for try in 0 1 1 1 1 ; do
             if ! pkill -u $MYUID $p ; then
                 break