upgrade/hammer-x: wait for osdmaps to propagate

Fixes: http://tracker.ceph.com/issues/17808
Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 468e9996e2d029632804596e1026a7770660bfb1..6bf8f4a3ad8d531a8cdc00f8de02ad5b4e7b235f 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -7,6 +7,7 @@ upgrade-sequence:
    - print: "**** done ceph.restart do not wait for healthy"
    - exec:
        mon.a:
+         - sleep 300 # http://tracker.ceph.com/issues/17808
          - ceph osd set require_jewel_osds
    - ceph.healthy:
    - print: "**** done ceph.healthy"

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 2907ea3f78d89e06baf7560353110b1338892220..3a63c002bd63f02b364a8aad0c00efe5288f0a7c 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -29,6 +29,7 @@ upgrade-sequence:
        wait-for-healthy: false
    - exec:
        osd.0:
+         - sleep 300 # http://tracker.ceph.com/issues/17808
          - ceph osd set require_jewel_osds
    - ceph.healthy:
    - sleep:

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml b/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
index f39039a9781bb4e757266a8696274f55a0c657fe..f7a1b7b2cdb565afd8c2f5acb4ebdd7388475ea4 100644 (file)
--- a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
+++ b/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
@@ -101,5 +101,6 @@ tasks:
     wait-for-healthy: false
 - exec:
     mon.a:
-      -  ceph osd set require_jewel_osds
+      - sleep 300 # http://tracker.ceph.com/issues/17808
+      - ceph osd set require_jewel_osds
 - ceph.healthy: