From 3734280522a913ca8340ebc98b80978f63bade6f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 13 Jun 2017 16:58:13 +0800 Subject: [PATCH] qa/suites/upgrade: set "sortbitwise" for jewel clusters so ceph.healthy or wait-for-healthy won't be blocked by this warning. Signed-off-by: Kefu Chai --- .../hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 1 + .../parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml | 1 + qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml index ec1a88c767c..1aaeac807db 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -12,6 +12,7 @@ upgrade-sequence: - exec: mon.a: - sleep 300 # http://tracker.ceph.com/issues/17808 + - ceph osd set sortbitwise - ceph osd set require_jewel_osds - ceph.healthy: - print: "**** done ceph.healthy" diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml index a185cd5cc84..f2093da6e41 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml @@ -29,6 +29,7 @@ upgrade-sequence: - exec: osd.0: - sleep 300 # http://tracker.ceph.com/issues/17808 + - ceph osd set sortbitwise - ceph osd set require_jewel_osds - ceph.healthy: - sleep: diff --git a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml index c58c62c2b23..3af3cfd7243 100644 --- a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml @@ -46,6 +46,7 @@ upgrade-sequence: - exec: mon.a: - sleep 300 # http://tracker.ceph.com/issues/17808 + - ceph osd set sortbitwise - ceph osd set require_jewel_osds - ceph.healthy: - print: "**** done ceph.healthy" -- 2.39.5