qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters

Inspired by 3734280522a913ca8340ebc98b80978f63bade6f

This cannot be cherry-picked from master because master does not have
qa/suites/upgrade/hammer-x

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/qa/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/qa/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
index b9c3146b12bcad28ef90f79cb250106f2aa19772..b4b576b3f02acdbdef06341f4a8d2dbd6bcd1d54 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
@@ -91,6 +91,7 @@ tasks:
 - exec:
     mon.a:
     - sleep 60
+    - ceph osd set sortbitwise
     - ceph osd set require_jewel_osds
 - ceph_manager.wait_for_clean: null
 - ceph_manager.do_pg_scrub:

diff --git a/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index ec1a88c767cf7a9d083a916bc7af348303f3f43c..1aaeac807db5c8cb3a52d4b623b8820fb6c1485a 100644 (file)
--- a/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/hammer-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-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
index b5acf98f94d4528cc20e8cee3289ec5961f3a161..874260d8ecd661d633c2c2eae65604b04827f3a7 100644 (file)
--- a/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
+++ b/qa/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
@@ -32,6 +32,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-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml b/qa/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml
index 4bc6f7ee01d84a914d124abb9fad600de44eb282..3c23870343c20c5abaa0ae8f4855c83a9529fa9e 100644 (file)
--- a/qa/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml
+++ b/qa/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml
@@ -16,5 +16,6 @@ tasks:
 - exec:
     osd.0:
       - sleep 300 # http://tracker.ceph.com/issues/17808
+      - ceph osd set sortbitwise
       - ceph osd set require_jewel_osds
 - print: "**** done wait_for_mon_quorum 8-next-mon"

diff --git a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
index 5bbfda2e41e5d42e7bca8624c6f1b44ea28e7de1..bb04310690b374facc7be8c94547b108fe282fe7 100644 (file)
--- a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
+++ b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
@@ -77,6 +77,7 @@ upgrade-second-half:
       duration: 60
   - exec:
       mon.a:
+        - ceph osd set sortbitwise
         - ceph osd set require_jewel_osds
   - ceph.healthy:
   - print: "**** HEALTH_OK reached after upgrading last OSD to jewel"

diff --git a/qa/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml b/qa/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
index 896a56b4f09d8c0d8fd2ec560e2457d697d75fa1..98b1c734b41e6e79890786897b1c78685795f9e3 100644 (file)
--- a/qa/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
+++ b/qa/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
@@ -106,5 +106,6 @@ tasks:
 - exec:
     mon.a:
       - sleep 300 # http://tracker.ceph.com/issues/17808
+      - ceph osd set sortbitwise
       - ceph osd set require_jewel_osds
 - ceph.healthy: