From 96a456781cfef38c6c8737a4def2417ace6eb6c3 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Sun, 13 Mar 2016 16:15:43 -0400 Subject: [PATCH] upgrade/client-upgrade: only use supported features for RBD tests Signed-off-by: Jason Dillaman --- .../basic/2-workload/rbd_cli_import_export.yaml | 2 +- .../client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml | 3 +++ .../basic/2-workload/rbd_cli_import_export.yaml | 2 +- .../infernalis-client-x/rbd/0-cluster/start.yaml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git 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 index ab83df856e1..dfaa0e8783d 100644 --- 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" diff --git 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 index 0cdce9259e0..4d92f8005e8 100644 --- 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 diff --git 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 index deb849af2d1..5adc5ac4042 100644 --- 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" diff --git 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 index 0cdce9259e0..4d92f8005e8 100644 --- 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