rbd_fsx: expose krbd and related fsx options

Expose

-K (enable krbd mode) through 'krbd',
-Z (use direct IO) through 'direct_io',
-U (disable randomized striping) through 'randomized_striping',
-H (disable discard ops) through 'punch_holes',

-r readbdy (read alignment) through 'readbdy',
-w writebdy (write alignment) through 'writebdy',
-h holebdy (discard alignment) through 'holebdy'.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

diff --git a/teuthology/task/rbd_fsx.py b/teuthology/task/rbd_fsx.py
index 6d55b5cf457596ef23900482fd6c1cac0784df44..d848a88c566e88ac3c28773f768af37a1050089e 100644 (file)
--- a/teuthology/task/rbd_fsx.py
+++ b/teuthology/task/rbd_fsx.py
@@ -42,23 +42,41 @@ def task(ctx, config):
 
 def _run_one_client(ctx, config, role):
     """Spawned task that runs the client"""
+    krbd = config.get('krbd', False)
     testdir = teuthology.get_testdir(ctx)
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
-    remote.run(
-        args=[
-            'adjust-ulimits',
-            'ceph-coverage',
-            '{tdir}/archive/coverage'.format(tdir=testdir),
-            'ceph_test_librbd_fsx',
-            '-d',
-            '-W', '-R', # mmap doesn't work with rbd
-            '-p', str(config.get('progress_interval', 100)),  # show progress
-            '-P', '{tdir}/archive'.format(tdir=testdir),
-            '-t', str(config.get('truncbdy',1)),
-            '-l', str(config.get('size', 250000000)),
-            '-S', str(config.get('seed', 0)),
-            '-N', str(config.get('ops', 1000)),
-            'pool_{pool}'.format(pool=role),
-            'image_{image}'.format(image=role),
-            ],
-        )
+
+    args = []
+    if krbd:
+        args.append('sudo') # rbd map/unmap need privileges
+    args.extend([
+        'adjust-ulimits',
+        'ceph-coverage',
+        '{tdir}/archive/coverage'.format(tdir=testdir),
+        'ceph_test_librbd_fsx',
+        '-d', # debug output for all operations
+        '-W', '-R', # mmap doesn't work with rbd
+        '-p', str(config.get('progress_interval', 100)), # show progress
+        '-P', '{tdir}/archive'.format(tdir=testdir),
+        '-r', str(config.get('readbdy',1)),
+        '-w', str(config.get('writebdy',1)),
+        '-t', str(config.get('truncbdy',1)),
+        '-h', str(config.get('holebdy',1)),
+        '-l', str(config.get('size', 250000000)),
+        '-S', str(config.get('seed', 0)),
+        '-N', str(config.get('ops', 1000)),
+    ])
+    if krbd:
+        args.append('-K') # -K enables krbd mode
+    if config.get('direct_io', False):
+        args.append('-Z') # -Z use direct IO
+    if not config.get('randomized_striping', True):
+        args.append('-U') # -U disables randomized striping
+    if not config.get('punch_holes', True):
+        args.append('-H') # -H disables discard ops
+    args.extend([
+        'pool_{pool}'.format(pool=role),
+        'image_{image}'.format(image=role),
+    ])
+
+    remote.run(args=args)