Merge PR #39149 into master

* refs/pull/39149/head:
	qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2021-02-01 16:25:01 -06:00
commit fafdb1e47d

View File

@ -1544,7 +1544,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 | \