From 1747a387db25d0d6eaa2cb88c975f33a6a7bb62e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 Jun 2013 08:03:09 -0700 Subject: [PATCH] kernel: reorg kernel rbd tests; add a few missing scripts Move all the simple workunits into a separate collection, and test with and without msgr failure injection. There were a few tests in the workunits dir that we weren't running. --- suites/kernel/rbd-nomount/clusters/fixed-3.yaml | 1 + suites/kernel/rbd-nomount/msgr-failures/few.yaml | 5 +++++ suites/kernel/rbd-nomount/msgr-failures/many.yaml | 5 +++++ .../tasks/rbd_concurrent.yaml | 6 ------ .../tasks/rbd_image_read.yaml | 6 ------ suites/kernel/rbd-nomount/tasks/rbd_kernel.yaml | 5 +++++ .../rbd-nomount/tasks/rbd_map_snapshot_io.yaml | 5 +++++ suites/kernel/rbd-nomount/tasks/rbd_map_unmap.yaml | 5 +++++ suites/kernel/singleton/tasks/rbd_map_unmap.yaml | 12 ------------ 9 files changed, 26 insertions(+), 24 deletions(-) create mode 120000 suites/kernel/rbd-nomount/clusters/fixed-3.yaml create mode 100644 suites/kernel/rbd-nomount/msgr-failures/few.yaml create mode 100644 suites/kernel/rbd-nomount/msgr-failures/many.yaml rename suites/kernel/{singleton => rbd-nomount}/tasks/rbd_concurrent.yaml (67%) rename suites/kernel/{singleton => rbd-nomount}/tasks/rbd_image_read.yaml (79%) create mode 100644 suites/kernel/rbd-nomount/tasks/rbd_kernel.yaml create mode 100644 suites/kernel/rbd-nomount/tasks/rbd_map_snapshot_io.yaml create mode 100644 suites/kernel/rbd-nomount/tasks/rbd_map_unmap.yaml delete mode 100644 suites/kernel/singleton/tasks/rbd_map_unmap.yaml diff --git a/suites/kernel/rbd-nomount/clusters/fixed-3.yaml b/suites/kernel/rbd-nomount/clusters/fixed-3.yaml new file mode 120000 index 0000000000000..a3ac9fc4dec2f --- /dev/null +++ b/suites/kernel/rbd-nomount/clusters/fixed-3.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/kernel/rbd-nomount/msgr-failures/few.yaml b/suites/kernel/rbd-nomount/msgr-failures/few.yaml new file mode 100644 index 0000000000000..0de320d46b8e2 --- /dev/null +++ b/suites/kernel/rbd-nomount/msgr-failures/few.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + ms inject socket failures: 5000 diff --git a/suites/kernel/rbd-nomount/msgr-failures/many.yaml b/suites/kernel/rbd-nomount/msgr-failures/many.yaml new file mode 100644 index 0000000000000..86f8dde8a0e35 --- /dev/null +++ b/suites/kernel/rbd-nomount/msgr-failures/many.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + ms inject socket failures: 500 diff --git a/suites/kernel/singleton/tasks/rbd_concurrent.yaml b/suites/kernel/rbd-nomount/tasks/rbd_concurrent.yaml similarity index 67% rename from suites/kernel/singleton/tasks/rbd_concurrent.yaml rename to suites/kernel/rbd-nomount/tasks/rbd_concurrent.yaml index c8e95581b48c1..675b98e73a554 100644 --- a/suites/kernel/singleton/tasks/rbd_concurrent.yaml +++ b/suites/kernel/rbd-nomount/tasks/rbd_concurrent.yaml @@ -1,10 +1,4 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mds.a, osd.3, osd.4, osd.5] -- [client.0] tasks: -- install: -- ceph: - workunit: clients: all: diff --git a/suites/kernel/singleton/tasks/rbd_image_read.yaml b/suites/kernel/rbd-nomount/tasks/rbd_image_read.yaml similarity index 79% rename from suites/kernel/singleton/tasks/rbd_image_read.yaml rename to suites/kernel/rbd-nomount/tasks/rbd_image_read.yaml index 944f44f614be0..e5017e118d187 100644 --- a/suites/kernel/singleton/tasks/rbd_image_read.yaml +++ b/suites/kernel/rbd-nomount/tasks/rbd_image_read.yaml @@ -1,10 +1,4 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mds.a, osd.3, osd.4, osd.5] -- [client.0] tasks: -- install: -- ceph: - workunit: clients: all: diff --git a/suites/kernel/rbd-nomount/tasks/rbd_kernel.yaml b/suites/kernel/rbd-nomount/tasks/rbd_kernel.yaml new file mode 100644 index 0000000000000..aa155827c69f0 --- /dev/null +++ b/suites/kernel/rbd-nomount/tasks/rbd_kernel.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - rbd/kernel.sh diff --git a/suites/kernel/rbd-nomount/tasks/rbd_map_snapshot_io.yaml b/suites/kernel/rbd-nomount/tasks/rbd_map_snapshot_io.yaml new file mode 100644 index 0000000000000..c1529398b9ee8 --- /dev/null +++ b/suites/kernel/rbd-nomount/tasks/rbd_map_snapshot_io.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - rbd/map-snapshot-io.sh diff --git a/suites/kernel/rbd-nomount/tasks/rbd_map_unmap.yaml b/suites/kernel/rbd-nomount/tasks/rbd_map_unmap.yaml new file mode 100644 index 0000000000000..c2160997c8169 --- /dev/null +++ b/suites/kernel/rbd-nomount/tasks/rbd_map_unmap.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - rbd/map-unmap.sh diff --git a/suites/kernel/singleton/tasks/rbd_map_unmap.yaml b/suites/kernel/singleton/tasks/rbd_map_unmap.yaml deleted file mode 100644 index 56a5966a7f851..0000000000000 --- a/suites/kernel/singleton/tasks/rbd_map_unmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mds.a, osd.3, osd.4, osd.5] -- [client.0] -tasks: -- install: -- ceph: -- ceph-fuse: -- workunit: - clients: - all: - - rbd/map-unmap.sh -- 2.39.5