From b277946848fc2b5f454a7c6ffd8fa2a359369102 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 20 Feb 2015 13:48:28 -0500 Subject: [PATCH] suites/rbd: add object map tests Enable the object map feature for CLI tests and librbd API tests. Moved the CLI tests to a new group to exercise old format, basic new format, and new format w/ object map. Signed-off-by: Jason Dillaman --- suites/rbd/basic/tasks/rbd_cli_copy.yaml | 7 ------- suites/rbd/basic/tasks/rbd_cli_import_export.yaml | 7 ------- suites/rbd/cli/% | 0 suites/rbd/cli/base/install.yaml | 3 +++ suites/rbd/cli/cachepool/none.yaml | 0 suites/rbd/cli/cachepool/small.yaml | 11 +++++++++++ suites/rbd/cli/clusters/fixed-1.yaml | 1 + suites/rbd/cli/features/layering.yaml | 5 +++++ suites/rbd/cli/features/none.yaml | 1 + suites/rbd/cli/features/object_map.yaml | 6 ++++++ suites/rbd/cli/fs | 1 + suites/rbd/cli/msgr-failures/few.yaml | 5 +++++ suites/rbd/cli/msgr-failures/many.yaml | 5 +++++ .../workloads/rbd_cli_copy.yaml} | 0 .../workloads/rbd_cli_import_export.yaml} | 0 .../librbd/workloads/c_api_tests_with_object_map.yaml | 7 +++++++ .../workloads/python_api_tests_with_object_map.yaml | 7 +++++++ suites/rbd/thrash/workloads/rbd_api_tests.yaml | 2 +- .../thrash/workloads/rbd_api_tests_copy_on_read.yaml | 2 +- 19 files changed, 54 insertions(+), 16 deletions(-) delete mode 100644 suites/rbd/basic/tasks/rbd_cli_copy.yaml delete mode 100644 suites/rbd/basic/tasks/rbd_cli_import_export.yaml create mode 100644 suites/rbd/cli/% create mode 100644 suites/rbd/cli/base/install.yaml create mode 100644 suites/rbd/cli/cachepool/none.yaml create mode 100644 suites/rbd/cli/cachepool/small.yaml create mode 120000 suites/rbd/cli/clusters/fixed-1.yaml create mode 100644 suites/rbd/cli/features/layering.yaml create mode 100644 suites/rbd/cli/features/none.yaml create mode 100644 suites/rbd/cli/features/object_map.yaml create mode 120000 suites/rbd/cli/fs create mode 100644 suites/rbd/cli/msgr-failures/few.yaml create mode 100644 suites/rbd/cli/msgr-failures/many.yaml rename suites/rbd/{basic/tasks/rbd_cli_copy_old_format.yaml => cli/workloads/rbd_cli_copy.yaml} (100%) rename suites/rbd/{basic/tasks/rbd_cli_import_export_old_format.yaml => cli/workloads/rbd_cli_import_export.yaml} (100%) create mode 100644 suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml create mode 100644 suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml diff --git a/suites/rbd/basic/tasks/rbd_cli_copy.yaml b/suites/rbd/basic/tasks/rbd_cli_copy.yaml deleted file mode 100644 index ae95e51e066ad..0000000000000 --- a/suites/rbd/basic/tasks/rbd_cli_copy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/copy.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export.yaml deleted file mode 100644 index 49070827be09b..0000000000000 --- a/suites/rbd/basic/tasks/rbd_cli_import_export.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/rbd/cli/% b/suites/rbd/cli/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/rbd/cli/base/install.yaml b/suites/rbd/cli/base/install.yaml new file mode 100644 index 0000000000000..2030acb90836c --- /dev/null +++ b/suites/rbd/cli/base/install.yaml @@ -0,0 +1,3 @@ +tasks: +- install: +- ceph: diff --git a/suites/rbd/cli/cachepool/none.yaml b/suites/rbd/cli/cachepool/none.yaml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/rbd/cli/cachepool/small.yaml b/suites/rbd/cli/cachepool/small.yaml new file mode 100644 index 0000000000000..f8ed11040fa42 --- /dev/null +++ b/suites/rbd/cli/cachepool/small.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - ceph osd pool create cache 4 + - ceph osd tier add rbd cache + - ceph osd tier cache-mode cache writeback + - ceph osd tier set-overlay rbd cache + - ceph osd pool set cache hit_set_type bloom + - ceph osd pool set cache hit_set_count 8 + - ceph osd pool set cache hit_set_period 60 + - ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/cli/clusters/fixed-1.yaml b/suites/rbd/cli/clusters/fixed-1.yaml new file mode 120000 index 0000000000000..435ea3c7546aa --- /dev/null +++ b/suites/rbd/cli/clusters/fixed-1.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-1.yaml \ No newline at end of file diff --git a/suites/rbd/cli/features/layering.yaml b/suites/rbd/cli/features/layering.yaml new file mode 100644 index 0000000000000..233dd53667c87 --- /dev/null +++ b/suites/rbd/cli/features/layering.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd default format: 2 diff --git a/suites/rbd/cli/features/none.yaml b/suites/rbd/cli/features/none.yaml new file mode 100644 index 0000000000000..8b137891791fe --- /dev/null +++ b/suites/rbd/cli/features/none.yaml @@ -0,0 +1 @@ + diff --git a/suites/rbd/cli/features/object_map.yaml b/suites/rbd/cli/features/object_map.yaml new file mode 100644 index 0000000000000..4e31f21cc257d --- /dev/null +++ b/suites/rbd/cli/features/object_map.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + rbd default format: 2 + rbd default features: 13 diff --git a/suites/rbd/cli/fs b/suites/rbd/cli/fs new file mode 120000 index 0000000000000..3658920363d1a --- /dev/null +++ b/suites/rbd/cli/fs @@ -0,0 +1 @@ +../basic/fs \ No newline at end of file diff --git a/suites/rbd/cli/msgr-failures/few.yaml b/suites/rbd/cli/msgr-failures/few.yaml new file mode 100644 index 0000000000000..0de320d46b8e2 --- /dev/null +++ b/suites/rbd/cli/msgr-failures/few.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + ms inject socket failures: 5000 diff --git a/suites/rbd/cli/msgr-failures/many.yaml b/suites/rbd/cli/msgr-failures/many.yaml new file mode 100644 index 0000000000000..86f8dde8a0e35 --- /dev/null +++ b/suites/rbd/cli/msgr-failures/many.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + ms inject socket failures: 500 diff --git a/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml b/suites/rbd/cli/workloads/rbd_cli_copy.yaml similarity index 100% rename from suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml rename to suites/rbd/cli/workloads/rbd_cli_copy.yaml diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml b/suites/rbd/cli/workloads/rbd_cli_import_export.yaml similarity index 100% rename from suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml rename to suites/rbd/cli/workloads/rbd_cli_import_export.yaml diff --git a/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml b/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml new file mode 100644 index 0000000000000..fef368b9bc438 --- /dev/null +++ b/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + clients: + client.0: + - rbd/test_librbd.sh + env: + RBD_FEATURES: "13" diff --git a/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml b/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml new file mode 100644 index 0000000000000..ede74cd8d595e --- /dev/null +++ b/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + clients: + client.0: + - rbd/test_librbd_python.sh + env: + RBD_FEATURES: "13" diff --git a/suites/rbd/thrash/workloads/rbd_api_tests.yaml b/suites/rbd/thrash/workloads/rbd_api_tests.yaml index edd3118117536..fef368b9bc438 100644 --- a/suites/rbd/thrash/workloads/rbd_api_tests.yaml +++ b/suites/rbd/thrash/workloads/rbd_api_tests.yaml @@ -4,4 +4,4 @@ tasks: client.0: - rbd/test_librbd.sh env: - RBD_FEATURES: "5" + RBD_FEATURES: "13" diff --git a/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml b/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml index bf19b34ec7284..c013ac5ca1304 100644 --- a/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml +++ b/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml @@ -4,7 +4,7 @@ tasks: client.0: - rbd/test_librbd.sh env: - RBD_FEATURES: "5" + RBD_FEATURES: "13" overrides: ceph: conf: -- 2.39.5