marginal: refactor multiclient collection, separate out locktest

diff --git a/suites/marginal/fs-misc/clusters/two_clients.yaml b/suites/marginal/fs-misc/clusters/two_clients.yaml
new file mode 100644 (file)
index 0000000..2258bef
--- /dev/null
+++ b/suites/marginal/fs-misc/clusters/two_clients.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [client.1]
+- [client.0]

diff --git a/suites/marginal/fs-misc/fs/btrfs.yaml b/suites/marginal/fs-misc/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..4c7af31
--- /dev/null
+++ b/suites/marginal/fs-misc/fs/btrfs.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    fs: btrfs
+    conf:
+      osd:
+        osd op thread timeout: 60

diff --git a/suites/marginal/fs-misc/tasks/locktest.yaml b/suites/marginal/fs-misc/tasks/locktest.yaml
new file mode 100644 (file)
index 0000000..444bb1f
--- /dev/null
+++ b/suites/marginal/fs-misc/tasks/locktest.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+- ceph:
+- kclient:
+- locktest: [client.0, client.1]

diff --git a/suites/marginal/multiclient/clusters/three_clients.yaml b/suites/marginal/multiclient/clusters/three_clients.yaml
index d270f9e02b2c2ad60f847b7f2246db6a003ced6e..fd2535fd4a04c696ed72782f6ec43ef006a7e4cc 100644 (file)
--- a/suites/marginal/multiclient/clusters/three_clients.yaml
+++ b/suites/marginal/multiclient/clusters/three_clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
+- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
 - [client.2]
 - [client.1]
 - [client.0]

diff --git a/suites/marginal/multiclient/clusters/two_clients.yaml b/suites/marginal/multiclient/clusters/two_clients.yaml
index d062b8ce0406a724cd58eba5c0cfad7b8e6d6bbf..2258befd8bf965459b0ad6275d50af9ca0794dd1 100644 (file)
--- a/suites/marginal/multiclient/clusters/two_clients.yaml
+++ b/suites/marginal/multiclient/clusters/two_clients.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
+- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
 - [client.1]
 - [client.0]

diff --git a/suites/marginal/multiclient/mount/ceph-fuse.yaml b/suites/marginal/multiclient/mount/ceph-fuse.yaml
new file mode 100644 (file)
index 0000000..37ac5b6
--- /dev/null
+++ b/suites/marginal/multiclient/mount/ceph-fuse.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+- ceph:
+- ceph-fuse:

diff --git a/suites/marginal/multiclient/mount/kclient.yaml b/suites/marginal/multiclient/mount/kclient.yaml
new file mode 100644 (file)
index 0000000..c18db8f
--- /dev/null
+++ b/suites/marginal/multiclient/mount/kclient.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+- ceph:
+- kclient:

diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
deleted file mode 100644 (file)
index abaddc8..0000000
--- a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/fsx-mpi.c
-      - mpicc fsx-mpi.c -o fsx-mpi 
-      - rm fsx-mpi.c
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: $TESTDIR/gmnt
-- pexec:
-    all:
-      - rm $TESTDIR/gmnt
-      - rm $TESTDIR/fsx-mpi

diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
deleted file mode 100644 (file)
index dd3d8c2..0000000
--- a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-tasks:
-- install:
-- ceph:
-- kclient:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/fsx-mpi.c
-      - mpicc fsx-mpi.c -o fsx-mpi 
-      - rm fsx-mpi.c
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: $TESTDIR/gmnt
-- pexec:
-    all:
-      - rm $TESTDIR/gmnt
-      - rm $TESTDIR/fsx-mpi

diff --git a/suites/marginal/multiclient/tasks/fsx-mpi.yaml b/suites/marginal/multiclient/tasks/fsx-mpi.yaml
new file mode 100644 (file)
index 0000000..255a687
--- /dev/null
+++ b/suites/marginal/multiclient/tasks/fsx-mpi.yaml
@@ -0,0 +1,16 @@
+tasks:
+- pexec:
+    clients:
+      - cd $TESTDIR
+      - wget http://ceph.com/qa/fsx-mpi.c
+      - mpicc fsx-mpi.c -o fsx-mpi
+      - rm fsx-mpi.c
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
+- ssh_keys:
+- mpi:
+    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
+    workdir: $TESTDIR/gmnt
+- pexec:
+    all:
+      - rm $TESTDIR/gmnt
+      - rm $TESTDIR/fsx-mpi

diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
deleted file mode 100644 (file)
index 38c9563..0000000
--- a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/ior.tbz2
-      - tar xvfj ior.tbz2
-      - cd ior
-      - ./configure
-      - make
-      - make install DESTDIR=$TESTDIR/binary/
-      - cd $TESTDIR/
-      - rm ior.tbz2
-      - rm -r ior
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
-- pexec:
-    all:
-      - rm -f $TESTDIR/gmnt/ior.testfile
-      - rm -f $TESTDIR/gmnt
-      - rm -rf $TESTDIR/binary
\ No newline at end of file

diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
deleted file mode 100644 (file)
index 12d09df..0000000
--- a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- install:
-- ceph:
-- kclient:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/ior.tbz2
-      - tar xvfj ior.tbz2
-      - cd ior
-      - ./configure
-      - make
-      - make install DESTDIR=$TESTDIR/binary/
-      - cd $TESTDIR/
-      - rm ior.tbz2
-      - rm -r ior
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
-- pexec:
-    all:
-      - rm -f $TESTDIR/gmnt/ior.testfile
-      - rm -f $TESTDIR/gmnt

diff --git a/suites/marginal/multiclient/tasks/ior-shared-file.yaml b/suites/marginal/multiclient/tasks/ior-shared-file.yaml
new file mode 100644 (file)
index 0000000..5679578
--- /dev/null
+++ b/suites/marginal/multiclient/tasks/ior-shared-file.yaml
@@ -0,0 +1,22 @@
+tasks:
+- pexec:
+    clients:
+      - cd $TESTDIR
+      - wget http://ceph.com/qa/ior.tbz2
+      - tar xvfj ior.tbz2
+      - cd ior
+      - ./configure
+      - make
+      - make install DESTDIR=$TESTDIR/binary/
+      - cd $TESTDIR/
+      - rm ior.tbz2
+      - rm -r ior
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
+- ssh_keys:
+- mpi:
+    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
+- pexec:
+    all:
+      - rm -f $TESTDIR/gmnt/ior.testfile
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/binary

diff --git a/suites/marginal/multiclient/tasks/locktest.yaml b/suites/marginal/multiclient/tasks/locktest.yaml
deleted file mode 100644 (file)
index 444bb1f..0000000
--- a/suites/marginal/multiclient/tasks/locktest.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-- ceph:
-- kclient:
-- locktest: [client.0, client.1]

diff --git a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml b/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
deleted file mode 100644 (file)
index 48cb3d7..0000000
--- a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/mdtest-1.8.4.tgz
-      - tar xvfz mdtest-1.8.4.tgz
-      - rm $TESTDIR/mdtest-1.8.4.tgz
-      - cd mdtest-1.8.4
-      - make
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
-- pexec:
-    all:
-      - rm -f $TESTDIR/gmnt
-      - rm -rf $TESTDIR/mdtest-1.8.4
-      - rm -rf $TESTDIR/._mdtest-1.8.4

diff --git a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml b/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
deleted file mode 100644 (file)
index d18b4bd..0000000
--- a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- install:
-- ceph:
-- kclient:
-- pexec:
-    clients:
-      - cd $TESTDIR
-      - wget http://ceph.com/qa/mdtest-1.8.4.tgz
-      - tar xvfz mdtest-1.8.4.tgz
-      - rm $TESTDIR/mdtest-1.8.4.tgz
-      - cd mdtest-1.8.4
-      - make
-      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
-- ssh_keys:
-- mpi:
-    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
-- pexec:
-    all:
-      - rm -f $TESTDIR/gmnt
-      - rm -rf $TESTDIR/mdtest-1.8.4
-      - rm -rf $TESTDIR/._mdtest-1.8.4

diff --git a/suites/marginal/multiclient/tasks/mdtest.yaml b/suites/marginal/multiclient/tasks/mdtest.yaml
new file mode 100644 (file)
index 0000000..7a7ed57
--- /dev/null
+++ b/suites/marginal/multiclient/tasks/mdtest.yaml
@@ -0,0 +1,18 @@
+tasks:
+- pexec:
+    clients:
+      - cd $TESTDIR
+      - wget http://ceph.com/qa/mdtest-1.8.4.tgz
+      - tar xvfz mdtest-1.8.4.tgz
+      - rm $TESTDIR/mdtest-1.8.4.tgz
+      - cd mdtest-1.8.4
+      - make
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
+- ssh_keys:
+- mpi:
+    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
+- pexec:
+    all:
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/mdtest-1.8.4
+      - rm -rf $TESTDIR/._mdtest-1.8.4