From 5d8795d97a9d68cffc114d246986ec515113b077 Mon Sep 17 00:00:00 2001 From: tamil Date: Wed, 18 Dec 2013 16:52:47 -0800 Subject: [PATCH] moved samba suite a level up [suites/fs/samba to suites/samba] Signed-off-by: tamil --- suites/{fs/samba => }/% | 0 .../{fs/samba => }/clusters/samba-basic.yaml | 0 suites/debug/mds_client.yaml | 1 + suites/fs/samba/debug/mds_client.yaml | 1 - suites/fs/samba/fs/btrfs.yaml | 1 - suites/{fs/samba => }/install/install.yaml | 0 suites/{fs/samba => }/mount/fuse.yaml | 0 suites/{fs/samba => }/mount/kclient.yaml | 0 suites/{fs/samba => }/mount/native.yaml | 0 suites/{fs/samba => }/mount/noceph.yaml | 0 suites/samba/% | 0 suites/samba/clusters/samba-basic.yaml | 3 ++ suites/samba/debug/mds_client.yaml | 1 + suites/samba/fs/btrfs.yaml | 1 + suites/samba/install/install.yaml | 6 +++ suites/samba/mount/fuse.yaml | 6 +++ suites/samba/mount/kclient.yaml | 6 +++ suites/samba/mount/native.yaml | 2 + suites/samba/mount/noceph.yaml | 5 +++ .../{fs => }/samba/workload/cifs-dbench.yaml | 0 .../samba/workload/cifs-fsstress.yaml | 0 .../workload/cifs-kernel-build.yaml.disabled | 0 .../samba/workload/cifs-tiobench.yaml | 0 .../{fs => }/samba/workload/smbtorture.yaml | 0 suites/workload/cifs-dbench.yaml | 8 ++++ suites/workload/cifs-fsstress.yaml | 8 ++++ .../workload/cifs-kernel-build.yaml.disabled | 9 +++++ suites/workload/cifs-tiobench.yaml | 8 ++++ suites/workload/smbtorture.yaml | 39 +++++++++++++++++++ 29 files changed, 103 insertions(+), 2 deletions(-) rename suites/{fs/samba => }/% (100%) rename suites/{fs/samba => }/clusters/samba-basic.yaml (100%) create mode 120000 suites/debug/mds_client.yaml delete mode 120000 suites/fs/samba/debug/mds_client.yaml delete mode 120000 suites/fs/samba/fs/btrfs.yaml rename suites/{fs/samba => }/install/install.yaml (100%) rename suites/{fs/samba => }/mount/fuse.yaml (100%) rename suites/{fs/samba => }/mount/kclient.yaml (100%) rename suites/{fs/samba => }/mount/native.yaml (100%) rename suites/{fs/samba => }/mount/noceph.yaml (100%) create mode 100644 suites/samba/% create mode 100644 suites/samba/clusters/samba-basic.yaml create mode 120000 suites/samba/debug/mds_client.yaml create mode 120000 suites/samba/fs/btrfs.yaml create mode 100644 suites/samba/install/install.yaml create mode 100644 suites/samba/mount/fuse.yaml create mode 100644 suites/samba/mount/kclient.yaml create mode 100644 suites/samba/mount/native.yaml create mode 100644 suites/samba/mount/noceph.yaml rename suites/{fs => }/samba/workload/cifs-dbench.yaml (100%) rename suites/{fs => }/samba/workload/cifs-fsstress.yaml (100%) rename suites/{fs => }/samba/workload/cifs-kernel-build.yaml.disabled (100%) rename suites/{fs => }/samba/workload/cifs-tiobench.yaml (100%) rename suites/{fs => }/samba/workload/smbtorture.yaml (100%) create mode 100644 suites/workload/cifs-dbench.yaml create mode 100644 suites/workload/cifs-fsstress.yaml create mode 100644 suites/workload/cifs-kernel-build.yaml.disabled create mode 100644 suites/workload/cifs-tiobench.yaml create mode 100644 suites/workload/smbtorture.yaml diff --git a/suites/fs/samba/% b/suites/% similarity index 100% rename from suites/fs/samba/% rename to suites/% diff --git a/suites/fs/samba/clusters/samba-basic.yaml b/suites/clusters/samba-basic.yaml similarity index 100% rename from suites/fs/samba/clusters/samba-basic.yaml rename to suites/clusters/samba-basic.yaml diff --git a/suites/debug/mds_client.yaml b/suites/debug/mds_client.yaml new file mode 120000 index 000000000000..2550b024dede --- /dev/null +++ b/suites/debug/mds_client.yaml @@ -0,0 +1 @@ +../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/fs/samba/debug/mds_client.yaml b/suites/fs/samba/debug/mds_client.yaml deleted file mode 120000 index 335c1cafed75..000000000000 --- a/suites/fs/samba/debug/mds_client.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/fs/samba/fs/btrfs.yaml b/suites/fs/samba/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e..000000000000 --- a/suites/fs/samba/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/fs/samba/install/install.yaml b/suites/install/install.yaml similarity index 100% rename from suites/fs/samba/install/install.yaml rename to suites/install/install.yaml diff --git a/suites/fs/samba/mount/fuse.yaml b/suites/mount/fuse.yaml similarity index 100% rename from suites/fs/samba/mount/fuse.yaml rename to suites/mount/fuse.yaml diff --git a/suites/fs/samba/mount/kclient.yaml b/suites/mount/kclient.yaml similarity index 100% rename from suites/fs/samba/mount/kclient.yaml rename to suites/mount/kclient.yaml diff --git a/suites/fs/samba/mount/native.yaml b/suites/mount/native.yaml similarity index 100% rename from suites/fs/samba/mount/native.yaml rename to suites/mount/native.yaml diff --git a/suites/fs/samba/mount/noceph.yaml b/suites/mount/noceph.yaml similarity index 100% rename from suites/fs/samba/mount/noceph.yaml rename to suites/mount/noceph.yaml diff --git a/suites/samba/% b/suites/samba/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/samba/clusters/samba-basic.yaml b/suites/samba/clusters/samba-basic.yaml new file mode 100644 index 000000000000..caced4a26d1b --- /dev/null +++ b/suites/samba/clusters/samba-basic.yaml @@ -0,0 +1,3 @@ +roles: +- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1] +- [samba.0, client.0, client.1] diff --git a/suites/samba/debug/mds_client.yaml b/suites/samba/debug/mds_client.yaml new file mode 120000 index 000000000000..2550b024dede --- /dev/null +++ b/suites/samba/debug/mds_client.yaml @@ -0,0 +1 @@ +../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/samba/fs/btrfs.yaml b/suites/samba/fs/btrfs.yaml new file mode 120000 index 000000000000..ea693ab0b420 --- /dev/null +++ b/suites/samba/fs/btrfs.yaml @@ -0,0 +1 @@ +../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/samba/install/install.yaml b/suites/samba/install/install.yaml new file mode 100644 index 000000000000..12f1e8522905 --- /dev/null +++ b/suites/samba/install/install.yaml @@ -0,0 +1,6 @@ +tasks: +- install: +- install: + project: samba + extra_packages: ['samba'] +- ceph: diff --git a/suites/samba/mount/fuse.yaml b/suites/samba/mount/fuse.yaml new file mode 100644 index 000000000000..d00ffdb4804a --- /dev/null +++ b/suites/samba/mount/fuse.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph-fuse: [client.0] +- samba: + samba.0: + ceph: "{testdir}/mnt.0" + diff --git a/suites/samba/mount/kclient.yaml b/suites/samba/mount/kclient.yaml new file mode 100644 index 000000000000..56590adcb4f1 --- /dev/null +++ b/suites/samba/mount/kclient.yaml @@ -0,0 +1,6 @@ +tasks: +- kclient: [client.0] +- samba: + samba.0: + ceph: "{testdir}/mnt.0" + diff --git a/suites/samba/mount/native.yaml b/suites/samba/mount/native.yaml new file mode 100644 index 000000000000..09b8c1c4e3d5 --- /dev/null +++ b/suites/samba/mount/native.yaml @@ -0,0 +1,2 @@ +tasks: +- samba: diff --git a/suites/samba/mount/noceph.yaml b/suites/samba/mount/noceph.yaml new file mode 100644 index 000000000000..3cad4740d8b8 --- /dev/null +++ b/suites/samba/mount/noceph.yaml @@ -0,0 +1,5 @@ +tasks: +- localdir: [client.0] +- samba: + samba.0: + ceph: "{testdir}/mnt.0" diff --git a/suites/fs/samba/workload/cifs-dbench.yaml b/suites/samba/workload/cifs-dbench.yaml similarity index 100% rename from suites/fs/samba/workload/cifs-dbench.yaml rename to suites/samba/workload/cifs-dbench.yaml diff --git a/suites/fs/samba/workload/cifs-fsstress.yaml b/suites/samba/workload/cifs-fsstress.yaml similarity index 100% rename from suites/fs/samba/workload/cifs-fsstress.yaml rename to suites/samba/workload/cifs-fsstress.yaml diff --git a/suites/fs/samba/workload/cifs-kernel-build.yaml.disabled b/suites/samba/workload/cifs-kernel-build.yaml.disabled similarity index 100% rename from suites/fs/samba/workload/cifs-kernel-build.yaml.disabled rename to suites/samba/workload/cifs-kernel-build.yaml.disabled diff --git a/suites/fs/samba/workload/cifs-tiobench.yaml b/suites/samba/workload/cifs-tiobench.yaml similarity index 100% rename from suites/fs/samba/workload/cifs-tiobench.yaml rename to suites/samba/workload/cifs-tiobench.yaml diff --git a/suites/fs/samba/workload/smbtorture.yaml b/suites/samba/workload/smbtorture.yaml similarity index 100% rename from suites/fs/samba/workload/smbtorture.yaml rename to suites/samba/workload/smbtorture.yaml diff --git a/suites/workload/cifs-dbench.yaml b/suites/workload/cifs-dbench.yaml new file mode 100644 index 000000000000..c13c1c099e58 --- /dev/null +++ b/suites/workload/cifs-dbench.yaml @@ -0,0 +1,8 @@ +tasks: +- cifs-mount: + client.1: + share: ceph +- workunit: + clients: + client.1: + - suites/dbench.sh diff --git a/suites/workload/cifs-fsstress.yaml b/suites/workload/cifs-fsstress.yaml new file mode 100644 index 000000000000..ff003af3433f --- /dev/null +++ b/suites/workload/cifs-fsstress.yaml @@ -0,0 +1,8 @@ +tasks: +- cifs-mount: + client.1: + share: ceph +- workunit: + clients: + client.1: + - suites/fsstress.sh diff --git a/suites/workload/cifs-kernel-build.yaml.disabled b/suites/workload/cifs-kernel-build.yaml.disabled new file mode 100644 index 000000000000..ab9ff8ac7314 --- /dev/null +++ b/suites/workload/cifs-kernel-build.yaml.disabled @@ -0,0 +1,9 @@ +tasks: +- cifs-mount: + client.1: + share: ceph +- workunit: + clients: + client.1: + - kernel_untar_build.sh + diff --git a/suites/workload/cifs-tiobench.yaml b/suites/workload/cifs-tiobench.yaml new file mode 100644 index 000000000000..aed757201411 --- /dev/null +++ b/suites/workload/cifs-tiobench.yaml @@ -0,0 +1,8 @@ +tasks: +- cifs-mount: + client.1: + share: ceph +- workunit: + clients: + client.1: + - suites/tiobench.sh diff --git a/suites/workload/smbtorture.yaml b/suites/workload/smbtorture.yaml new file mode 100644 index 000000000000..823489a20828 --- /dev/null +++ b/suites/workload/smbtorture.yaml @@ -0,0 +1,39 @@ +tasks: +- pexec: + client.1: + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.lock + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.fdpass + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.unlink + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.attr + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.trans2 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.negnowait + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.dir1 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny1 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny2 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.deny3 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.denydos + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny1 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.ntdeny2 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcon + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.tcondev + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.vuid + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rw1 + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.open + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.defer_open + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.xcopy + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.rename + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.properties + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.mangle + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.openattr + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.chkpath + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.secleak + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.disconnect + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.samba3error + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.smb +# - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdcon +# - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-holdopen + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-readwrite + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.bench-torture + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-pipe_number + - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-ioctl +# - /usr/local/samba/bin/smbtorture --password=ubuntu //localhost/ceph base.scan-maxfid -- 2.47.3