testrados: rename testsnaps to testrados and make snap testing optional

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/teuthology/task/testrados.py b/teuthology/task/testrados.py
new file mode 100644 (file)
index 0000000..97a36d2
--- /dev/null
+++ b/teuthology/task/testrados.py
@@ -0,0 +1,103 @@
+import contextlib
+import logging
+
+from ..orchestra import run
+
+log = logging.getLogger(__name__)
+
+@contextlib.contextmanager
+def task(ctx, config):
+    """
+    Run testrados
+
+    The config should be as follows:
+
+    testrados:
+        clients: [client list]
+        ops: <number of ops>
+        objects: <number of objects to use>
+        maxinflight: <max number of operations in flight>
+        snaps: <create/remove/rollback snaps>
+
+    example:
+
+    tasks:
+    - ceph:
+    - testrados:
+        clients: [client.0]
+        ops: 1000
+        objects: 25
+        maxinflight: 16
+        snaps: true
+    - interactive:
+    """
+    log.info('Beginning testrados...')
+    assert isinstance(config, dict), \
+        "please list clients to run on"
+    testrados = {}
+
+    (mon,) = ctx.cluster.only('mon.0').remotes.iterkeys()
+    remotes = []
+    for role in config.get('clients', ['client.0']):
+        assert isinstance(role, basestring)
+        PREFIX = 'client.'
+        assert role.startswith(PREFIX)
+        id_ = role[len(PREFIX):]
+        (remote,) = ctx.cluster.only(role).remotes.iterkeys()
+        remotes.append(remote)
+
+        remote.run(
+            args=[
+                'cp',
+                '/tmp/cephtest/ceph.conf',
+                '/tmp/cephtest/data/ceph.conf',
+                ],
+            logger=log.getChild('testrados.{id}'.format(id=id_)),
+            wait=True,
+            )
+
+        commandstring = ""
+        if not config.get('snaps', False):
+            commandstring = " ".join([
+                    'cd', '/tmp/cephtest/data;',
+                    'export CEPH_CLIENT_ID={id_}; LD_PRELOAD=/tmp/cephtest/binary/usr/local/lib/librados.so.2 /tmp/cephtest/binary/usr/local/bin/testreadwrite'.format(
+                        id_=id_),
+                    str(config.get('ops', '10000')),
+                    str(config.get('objects', '500')),
+                    str(50),
+                    str(config.get('maxinflight', '16')),
+                    ])
+        else:
+            commandstring = " ".join([
+                    'cd', '/tmp/cephtest/data;',
+                    'export CEPH_CLIENT_ID={id_}; LD_PRELOAD=/tmp/cephtest/binary/usr/local/lib/librados.so.2 /tmp/cephtest/binary/usr/local/bin/testsnaps'.format(
+                        id_=id_),
+                    str(config.get('ops', '1000')),
+                    str(config.get('objects', '25')),
+                    str(config.get('maxinflight', '16')),
+                    ])
+
+
+        proc = remote.run(
+            args=['/bin/sh', '-c', commandstring],
+            logger=log.getChild('testrados.{id}'.format(id=id_)),
+            stdin=run.PIPE,
+            wait=False
+            )
+        testrados[id_] = proc
+
+    try:
+        yield
+    finally:
+        for i in remotes:
+            i.run(
+                args=[
+                    'rm',
+                    '/tmp/cephtest/data/ceph.conf'
+                    ],
+                logger=log.getChild('testrados.{id}'.format(id=id_)),
+                wait=True,
+                )
+
+        log.info('joining testrados')
+        run.wait(testrados.itervalues())

diff --git a/teuthology/task/testsnaps.py b/teuthology/task/testsnaps.py
deleted file mode 100644 (file)
index 897b842..0000000
--- a/teuthology/task/testsnaps.py
+++ /dev/null
@@ -1,89 +0,0 @@
-import contextlib
-import logging
-
-from ..orchestra import run
-
-log = logging.getLogger(__name__)
-
-@contextlib.contextmanager
-def task(ctx, config):
-    """
-    Run testsnaps
-
-    The config should be as follows:
-
-    testsnaps:
-        clients: [client list]
-        ops: <number of ops>
-        objects: <number of objects to use>
-        maxinflight: <max number of operations in flight>
-
-    example:
-
-    tasks:
-    - ceph:
-    - testsnaps:
-        clients: [client.0]
-        ops: 1000
-        objects: 25
-        maxinflight: 16
-    - interactive:
-    """
-    log.info('Beginning testsnaps...')
-    assert isinstance(config, dict), \
-        "please list clients to run on"
-    testsnaps = {}
-
-    (mon,) = ctx.cluster.only('mon.0').remotes.iterkeys()
-    remotes = []
-    for role in config.get('clients', ['client.0']):
-        assert isinstance(role, basestring)
-        PREFIX = 'client.'
-        assert role.startswith(PREFIX)
-        id_ = role[len(PREFIX):]
-        (remote,) = ctx.cluster.only(role).remotes.iterkeys()
-        remotes.append(remote)
-
-        remote.run(
-            args=[
-                'cp',
-                '/tmp/cephtest/ceph.conf',
-                '/tmp/cephtest/data/ceph.conf',
-                ],
-            logger=log.getChild('testsnaps.{id}'.format(id=id_)),
-            wait=True,
-            )
-
-        proc = remote.run(
-            args=[
-                '/bin/sh', '-c',
-                " ".join([
-                    'cd', '/tmp/cephtest/data;',
-                    'export CEPH_CLIENT_ID={id_}; LD_PRELOAD=/tmp/cephtest/binary/usr/local/lib/librados.so.2 /tmp/cephtest/binary/usr/local/bin/testsnaps'.format(
-                        id_=id_),
-                    str(config.get('ops', '1000')),
-                    str(config.get('objects', '25')),
-                    str(config.get('maxinflight', '16')),
-                    ])
-                ],
-            logger=log.getChild('testsnaps.{id}'.format(id=id_)),
-            stdin=run.PIPE,
-            wait=False
-            )
-        testsnaps[id_] = proc
-
-    try:
-        yield
-    finally:
-        for i in remotes:
-            i.run(
-                args=[
-                    'rm',
-                    '/tmp/cephtest/data/ceph.conf'
-                    ],
-                logger=log.getChild('testsnaps.{id}'.format(id=id_)),
-                wait=True,
-                )
-
-        log.info('joining testrados')
-        run.wait(testsnaps.itervalues())