Merge pull request #871 from ceph/wip-rbd-client-upgrade

upgrade/client-upgrade: only use supported features for RBD tests Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2025-03-11 02:39:05 +00:00 · 2016-03-14 00:06:40 -07:00 · 2016-03-14 00:06:40 -07:00 · 6718f70eae
commit 6718f70eae
parent ebdcd29bde 96a456781c
4 changed files with 8 additions and 2 deletions
--- a/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
@ -9,5 +9,5 @@ tasks:
      client.0:
      - rbd/import_export.sh
    env:
-      RBD_CREATE_ARGS: --new-format
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
 - print: "**** done rbd/import_export.sh"
--- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
@ -11,3 +11,6 @@ overrides:
  ceph:
    log-whitelist:
    - failed to encode map
+    conf:
+      client:
+        rbd default features: 1
--- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
@ -9,5 +9,5 @@ tasks:
      client.0:
      - rbd/import_export.sh
    env:
-      RBD_CREATE_ARGS: --new-format
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
 - print: "**** done rbd/import_export.sh"
--- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
@ -11,3 +11,6 @@ overrides:
  ceph:
    log-whitelist:
    - failed to encode map
+    conf:
+      client:
+        rbd default features: 1