From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 10 Jun 2016 14:56:32 +0000 (-0400)
Subject: rbd: added rbd-nbd fsx test case
X-Git-Tag: v11.1.1~58^2^2~169^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7425e2d7a64e2962f6a7bc6f6ba09ee9137e7a14;p=ceph.git

rbd: added rbd-nbd fsx test case

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

diff --git a/suites/rbd/thrash/workloads/rbd_fsx_nbd.yaml b/suites/rbd/thrash/workloads/rbd_fsx_nbd.yaml
new file mode 100644
index 000000000000..b6e9d5b16484
--- /dev/null
+++ b/suites/rbd/thrash/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/tasks/rbd_fsx.py b/tasks/rbd_fsx.py
index 56a409e4b69d..ab1a47f093cb 100644
--- a/tasks/rbd_fsx.py
+++ b/tasks/rbd_fsx.py
@@ -44,12 +44,13 @@ def task(ctx, config):
 def _run_one_client(ctx, config, role):
     """Spawned task that runs the client"""
     krbd = config.get('krbd', False)
+    nbd = config.get('nbd', False)
     testdir = teuthology.get_testdir(ctx)
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
 
     args = []
-    if krbd:
-        args.append('sudo') # rbd map/unmap need privileges
+    if krbd or nbd:
+        args.append('sudo') # rbd(-nbd) map/unmap need privileges
     args.extend([
         'adjust-ulimits',
         'ceph-coverage',
@@ -83,6 +84,8 @@ def _run_one_client(ctx, config, role):
     ])
     if krbd:
         args.append('-K') # -K enables krbd mode
+    if nbd:
+        args.append('-M') # -M enables nbd mode
     if config.get('direct_io', False):
         args.append('-Z') # -Z use direct IO
     if not config.get('randomized_striping', True):