]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test 39149/head
authorSage Weil <sage@newdream.net>
Thu, 28 Jan 2021 19:19:56 +0000 (13:19 -0600)
committerSage Weil <sage@newdream.net>
Thu, 28 Jan 2021 19:20:22 +0000 (13:20 -0600)
Signed-off-by: Sage Weil <sage@newdream.net>
qa/workunits/cephtool/test.sh

index 3c1eb36cb21f3c3e840f90a6dbb7e72434bf809b..b99b84ef30a153904cf1f75d34a39e2e466ed57c 100755 (executable)
@@ -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 | \