From: huangjun <huangjun@xsky.com>
Date: Mon, 9 Oct 2017 14:05:21 +0000 (+0800)
Subject: qa/standalone/osd/osd-mark-down: create pool to get updated osdmap faster
X-Git-Tag: v12.2.3~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9f5612bd789ca17a01c6e51794e2f65e40ecaed;p=ceph.git

qa/standalone/osd/osd-mark-down: create pool to get updated osdmap faster

Mon send osdmap to random osds after we mark osd down, the down osd
may use more than $sleep time to get updated osdmap if there is no
osd ping between osds. So create pool after setup cluster.

Signed-off-by: huangjun <huangjun@xsky.com>
(cherry picked from commit ee618a38a9ed06b3ea4d02e46cdeae6afb376b82)
---

diff --git a/qa/standalone/osd/osd-markdown.sh b/qa/standalone/osd/osd-markdown.sh
index b3c800c081dc..6a28a305caaf 100755
--- a/qa/standalone/osd/osd-markdown.sh
+++ b/qa/standalone/osd/osd-markdown.sh
@@ -59,6 +59,9 @@ function TEST_markdown_exceed_maxdown_count() {
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
+
+    create_rbd_pool || return 1
+
     # 3+1 times within 300s, osd should stay dead on the 4th time
     local count=3
     local sleeptime=10
@@ -80,6 +83,8 @@ function TEST_markdown_boot() {
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
 
+    create_rbd_pool || return 1
+
     # 3 times within 120s, should stay up
     local count=3
     local sleeptime=10
@@ -102,6 +107,7 @@ function TEST_markdown_boot_exceed_time() {
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
 
+    create_rbd_pool || return 1
 
     # 3+1 times, but over 40s, > 20s, so should stay up
     local count=3