]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down
authorSage Weil <sage@redhat.com>
Wed, 20 Nov 2019 02:03:44 +0000 (20:03 -0600)
committerSébastien Han <seb@redhat.com>
Tue, 21 Jan 2020 09:11:34 +0000 (10:11 +0100)
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)

qa/standalone/ceph-helpers.sh

index 52b0eee691714fd6a9d7bbf39a5d68613084cf83..dd9d88c972aff2157752a3656fe716c0b8f42005 100755 (executable)
@@ -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