From afdff0cd3fa5d2daabc328b5b7164bfab8c4eb0f Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 19 Mar 2020 17:19:46 +0800 Subject: [PATCH] qa/*/osd-markdown.sh: propagate map to osd before testing its reaction Mon might fail to share the newest map with any of up osds, e.g., due to an injected broken pipe. Since we don't have any client activities during the osd-markdown tests, osds might be unaware of the map changes made through CLI. Make sure osds have pulled the newest map down before we can test its reaction correctly. Fixes: https://tracker.ceph.com/issues/44662 Signed-off-by: xie xingguo --- qa/standalone/osd/osd-markdown.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qa/standalone/osd/osd-markdown.sh b/qa/standalone/osd/osd-markdown.sh index d24463064bd1b..5c4a784406dc1 100755 --- a/qa/standalone/osd/osd-markdown.sh +++ b/qa/standalone/osd/osd-markdown.sh @@ -42,6 +42,7 @@ function markdown_N_impl() { for i in `seq 1 $markdown_times` do # check the OSD is UP + ceph tell osd.0 get_latest_osdmap || return 1 ceph osd tree ceph osd tree | grep osd.0 |grep up || return 1 # mark the OSD down. @@ -98,6 +99,7 @@ function TEST_markdown_boot() { markdown_N_impl $count $period $sleeptime #down N times, osd.0 should be up sleep 15 # give osd plenty of time to notice and come back up + ceph tell osd.0 get_latest_osdmap || return 1 ceph osd tree | grep up | grep osd.0 || return 1 } @@ -121,6 +123,7 @@ function TEST_markdown_boot_exceed_time() { markdown_N_impl $(($count+1)) $period $sleeptime sleep 15 # give osd plenty of time to notice and come back up + ceph tell osd.0 get_latest_osdmap || return 1 ceph osd tree | grep up | grep osd.0 || return 1 } -- 2.39.5