From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Dec 2018 20:16:48 +0000 (-0600)
Subject: qa/standalone/mon/misc.sh: tweak test to be more robust
X-Git-Tag: v14.1.0~484^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7559a47f5ba3c21317ddb7cae82122fcc7bd02f0;p=ceph.git

qa/standalone/mon/misc.sh: tweak test to be more robust

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/mon/misc.sh b/qa/standalone/mon/misc.sh
index c03f7df2014..4416cb451a6 100755
--- a/qa/standalone/mon/misc.sh
+++ b/qa/standalone/mon/misc.sh
@@ -125,8 +125,12 @@ function TEST_mon_add_to_single_mon() {
     # without the fix of #5454, mon.a will assert failure at seeing the MMonJoin
     # from mon.b
     run_mon $dir b --public-addr $MONB || return 1
+    # make sure mon.b get's it's join request in first, then
+    sleep 2
     # wait for the quorum
     timeout 120 ceph -s > /dev/null || return 1
+    ceph mon dump
+    ceph mon dump -f json-pretty
     local num_mons
     num_mons=$(ceph mon dump --format=json 2>/dev/null | jq ".mons | length") || return 1
     [ $num_mons == 2 ] || return 1