From b1374aa5ca27e504dcfdf62b172b26c21a50902c Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 9 Nov 2016 10:36:20 +0100 Subject: [PATCH] upgrade/hammer-x: wait for osdmaps to propagate Fixes: http://tracker.ceph.com/issues/17808 Signed-off-by: Loic Dachary --- .../hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 1 + .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 1 + suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) 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 468e9996e2d02..6bf8f4a3ad8d5 100644 --- 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 2907ea3f78d89..3a63c002bd63f 100644 --- 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 f39039a9781bb..f7a1b7b2cdb56 100644 --- 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: -- 2.39.5