From: Sage Weil Date: Sun, 21 Mar 2021 14:07:49 +0000 (-0500) Subject: qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh X-Git-Tag: v16.2.0~73^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40202%2Fhead;p=ceph.git qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh rgw changed the way it registered in the service map. Wait a bit for the old entries to be flushed out. Signed-off-by: Sage Weil (cherry picked from commit 3f3d955b19a1dcadbe8137b32eb695e8be6b496a) --- diff --git a/qa/suites/rados/cephadm/upgrade/4-wait.yaml b/qa/suites/rados/cephadm/upgrade/4-wait.yaml index e14aabff5f0..e71143dafe4 100644 --- a/qa/suites/rados/cephadm/upgrade/4-wait.yaml +++ b/qa/suites/rados/cephadm/upgrade/4-wait.yaml @@ -5,5 +5,9 @@ tasks: - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done - ceph orch ps - ceph versions + - echo "wait for servicemap items w/ changing names to refresh" + - sleep 60 + - ceph orch ps + - ceph versions - ceph versions | jq -e '.overall | length == 1' - ceph versions | jq -e '.overall | keys' | grep $sha1