From: Jason Dillaman Date: Fri, 20 Feb 2015 18:48:28 +0000 (-0500) Subject: suites/rbd: add object map tests X-Git-Tag: v0.94.10~27^2^2~162 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb6dd0e204e08514d07d1a254ad9da02c84cd8b1;p=ceph.git 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 (cherry picked from commit b277946848fc2b5f454a7c6ffd8fa2a359369102) --- 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 ae95e51e066a..000000000000 --- 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_copy_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml deleted file mode 100644 index 2f99f8990deb..000000000000 --- a/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/copy.sh 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 49070827be09..000000000000 --- 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/basic/tasks/rbd_cli_import_export_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml deleted file mode 100644 index b08f2612f7af..000000000000 --- a/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/import_export.sh diff --git a/suites/rbd/cli/% b/suites/rbd/cli/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/rbd/cli/base/install.yaml b/suites/rbd/cli/base/install.yaml new file mode 100644 index 000000000000..2030acb90836 --- /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 000000000000..e69de29bb2d1 diff --git a/suites/rbd/cli/cachepool/small.yaml b/suites/rbd/cli/cachepool/small.yaml new file mode 100644 index 000000000000..f8ed11040fa4 --- /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 000000000000..435ea3c7546a --- /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 000000000000..233dd53667c8 --- /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 000000000000..8b137891791f --- /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 000000000000..4e31f21cc257 --- /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 000000000000..3658920363d1 --- /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 000000000000..0de320d46b8e --- /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 000000000000..86f8dde8a0e3 --- /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/cli/workloads/rbd_cli_copy.yaml b/suites/rbd/cli/workloads/rbd_cli_copy.yaml new file mode 100644 index 000000000000..2f99f8990deb --- /dev/null +++ b/suites/rbd/cli/workloads/rbd_cli_copy.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + client.0: + - rbd/copy.sh diff --git a/suites/rbd/cli/workloads/rbd_cli_import_export.yaml b/suites/rbd/cli/workloads/rbd_cli_import_export.yaml new file mode 100644 index 000000000000..b08f2612f7af --- /dev/null +++ b/suites/rbd/cli/workloads/rbd_cli_import_export.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + client.0: + - rbd/import_export.sh 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 000000000000..fef368b9bc43 --- /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 000000000000..ede74cd8d595 --- /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 edd311811753..fef368b9bc43 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 bf19b34ec728..c013ac5ca130 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: