From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 8 Sep 2016 14:43:35 +0000 (-0400)
Subject: rbd: move nbd test workload to separate client host from OSDs
X-Git-Tag: v11.1.1~58^2^2~105^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15ab430918dfc9fc52da4a8404ac79191ba46f54;p=ceph.git

rbd: move nbd test workload to separate client host from OSDs

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/suites/rbd/nbd/% b/suites/rbd/nbd/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/rbd/nbd/base b/suites/rbd/nbd/base
new file mode 120000
index 000000000000..fd10a859de29
--- /dev/null
+++ b/suites/rbd/nbd/base
@@ -0,0 +1 @@
+../thrash/base
\ No newline at end of file
diff --git a/suites/rbd/nbd/cluster/+ b/suites/rbd/nbd/cluster/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/rbd/nbd/cluster/fixed-3.yaml b/suites/rbd/nbd/cluster/fixed-3.yaml
new file mode 100644
index 000000000000..455de4f98311
--- /dev/null
+++ b/suites/rbd/nbd/cluster/fixed-3.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2]
+- [mon.b, osd.3, osd.4, osd.5]
+- [client.0]
diff --git a/suites/rbd/nbd/cluster/openstack.yaml b/suites/rbd/nbd/cluster/openstack.yaml
new file mode 120000
index 000000000000..48becbb837b1
--- /dev/null
+++ b/suites/rbd/nbd/cluster/openstack.yaml
@@ -0,0 +1 @@
+../../thrash/clusters/openstack.yaml
\ No newline at end of file
diff --git a/suites/rbd/nbd/fs b/suites/rbd/nbd/fs
new file mode 120000
index 000000000000..c11782e04627
--- /dev/null
+++ b/suites/rbd/nbd/fs
@@ -0,0 +1 @@
+../thrash/fs
\ No newline at end of file
diff --git a/suites/rbd/nbd/msgr-failures b/suites/rbd/nbd/msgr-failures
new file mode 120000
index 000000000000..03689aa44a3e
--- /dev/null
+++ b/suites/rbd/nbd/msgr-failures
@@ -0,0 +1 @@
+../thrash/msgr-failures
\ No newline at end of file
diff --git a/suites/rbd/nbd/thrashers b/suites/rbd/nbd/thrashers
new file mode 120000
index 000000000000..f461dadc3f21
--- /dev/null
+++ b/suites/rbd/nbd/thrashers
@@ -0,0 +1 @@
+../thrash/thrashers
\ No newline at end of file
diff --git a/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml b/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml
new file mode 100644
index 000000000000..b6e9d5b16484
--- /dev/null
+++ b/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml
@@ -0,0 +1,15 @@
+os_type: ubuntu
+overrides:
+  install:
+    ceph:
+      extra_packages: [rbd-nbd]
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 6000
+    nbd: True
+    holebdy: 512
+    punch_holes: true
+    readbdy: 512
+    truncbdy: 512
+    writebdy: 512
diff --git a/suites/rbd/nbd/workloads/rbd_nbd.yaml b/suites/rbd/nbd/workloads/rbd_nbd.yaml
new file mode 100644
index 000000000000..897d07ceb4fd
--- /dev/null
+++ b/suites/rbd/nbd/workloads/rbd_nbd.yaml
@@ -0,0 +1,10 @@
+os_type: ubuntu
+overrides:
+  install:
+    ceph:
+      extra_packages: [rbd-nbd]
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/rbd-nbd.sh
diff --git a/suites/rbd/thrash/workloads/rbd_fsx_nbd.yaml b/suites/rbd/thrash/workloads/rbd_fsx_nbd.yaml
deleted file mode 100644
index b6e9d5b16484..000000000000
--- a/suites/rbd/thrash/workloads/rbd_fsx_nbd.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-os_type: ubuntu
-overrides:
-  install:
-    ceph:
-      extra_packages: [rbd-nbd]
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 6000
-    nbd: True
-    holebdy: 512
-    punch_holes: true
-    readbdy: 512
-    truncbdy: 512
-    writebdy: 512
diff --git a/suites/rbd/thrash/workloads/rbd_nbd.yaml b/suites/rbd/thrash/workloads/rbd_nbd.yaml
deleted file mode 100644
index 897d07ceb4fd..000000000000
--- a/suites/rbd/thrash/workloads/rbd_nbd.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-os_type: ubuntu
-overrides:
-  install:
-    ceph:
-      extra_packages: [rbd-nbd]
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/rbd-nbd.sh