From: Sage Weil <sage@newdream.net>
Date: Thu, 28 Jan 2021 19:19:56 +0000 (-0600)
Subject: qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test
X-Git-Tag: v17.1.0~3098^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39149%2Fhead;p=ceph.git

qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 3c1eb36cb21f..b99b84ef30a1 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1546,7 +1546,13 @@ function test_mon_osd()
   ceph osd info
   info_json=$(ceph osd info --format=json | jq -cM '.')
   dump_json=$(ceph osd dump --format=json | jq -cM '.osds')
-  [[ "${info_json}" == "${dump_json}" ]]
+  if [[ "${info_json}" != "${dump_json}" ]]; then
+    echo "waiting for OSDs to settle"
+    sleep 10
+    info_json=$(ceph osd info --format=json | jq -cM '.')
+    dump_json=$(ceph osd dump --format=json | jq -cM '.osds')
+    [[ "${info_json}" == "${dump_json}" ]]
+  fi
 
   info_json=$(ceph osd info 0 --format=json | jq -cM '.')
   dump_json=$(ceph osd dump --format=json | \