From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Nov 2019 02:03:44 +0000 (-0600)
Subject: qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down
X-Git-Tag: v14.2.8~20^2~20^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=561503f5911e5e645a7f76ada7f3c2a3aaf8ed52;p=ceph.git

qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down

Stopping the OSD doesn't guarantee that it will be marked down.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ede1d3677310bd152b3493e8a84da1e648fd3ea9)
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 52b0eee6917..dd9d88c972a 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -780,6 +780,7 @@ function destroy_osd() {
 
     ceph osd out osd.$id || return 1
     kill_daemons $dir TERM osd.$id || return 1
+    ceph osd down osd.$id || return 1
     ceph osd purge osd.$id --yes-i-really-mean-it || return 1
     teardown $dir/$id || return 1
     rm -fr $dir/$id