Add rgw task with hardcoded apache config.

diff --git a/teuthology/task/apache.conf b/teuthology/task/apache.conf
new file mode 100644 (file)
index 0000000..f9ac5cb
--- /dev/null
+++ b/teuthology/task/apache.conf
@@ -0,0 +1,34 @@
+LoadModule env_module /usr/lib/apache2/modules/mod_env.so
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
+LoadModule fastcgi_module /usr/lib/apache2/modules/mod_fastcgi.so
+
+Listen 7280
+ServerName rgwtest.example.com
+
+ServerRoot /tmp/cephtest/apache
+ErrorLog /tmp/cephtest/archive/apache/error.log
+LogFormat "%h l %u %t \"%r\" %>s %b \"{Referer}i\" \"%{User-agent}i\"" combined
+CustomLog /tmp/cephtest/archive/apache/access.log combined
+PidFile /tmp/cephtest/apache/tmp/apache.pid
+DocumentRoot /tmp/cephtest/apache/htdocs
+FastCgiIPCDir /tmp/cephtest/apache/tmp/fastcgi_sock
+FastCgiWrapper /tmp/cephtest/apache/htdocs/rgw.fcgi
+FastCgiServer /tmp/cephtest/binary/usr/local/bin/radosgw -user ubuntu -group ubuntu
+RewriteEngine On
+
+RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /rgw.fcgi?page=$1&params=$2&%{QUERY_STRING} [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+
+SetEnv LD_LIBRARY_PATH "/tmp/cephtest/binary/usr/local/lib"
+SetEnv RGW_LOG_LEVEL 20
+SetEnv RGW_PRINT_CONTINUE "yes"
+SetEnv CEPH_ARGS "-c /tmp/cephtest/ceph.conf"
+SetEnv RGW_SHOULD_LOG "yes"
+
+<Directory /tmp/cephtest/apache/htdocs>
+  Options +ExecCGI
+  AllowOverride All
+  SetHandler fastcgi-script
+</Directory>
+
+AllowEncodedSlashes On
+ServerSignature Off

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
new file mode 100644 (file)
index 0000000..ec29d7d
--- /dev/null
+++ b/teuthology/task/rgw.py
@@ -0,0 +1,170 @@
+import contextlib
+import logging
+import os
+
+from teuthology import misc as teuthology
+from teuthology import contextutil
+from orchestra import run
+
+log = logging.getLogger(__name__)
+
+
+@contextlib.contextmanager
+def create_dirs(ctx, config):
+    log.info('Creating apache directories...')
+    for client in config:
+        ctx.cluster.only(client).run(
+            args=[
+                'mkdir',
+                '-p',
+                '/tmp/cephtest/apache/htdocs',
+                '/tmp/cephtest/apache/tmp',
+                run.Raw('&&'),
+                'mkdir',
+                '/tmp/cephtest/archive/apache',
+                ],
+            )
+    try:
+        yield
+    finally:
+        log.info('Cleaning up apache directories...')
+        for client in config:
+            ctx.cluster.only(client).run(
+                args=[
+                    'rm',
+                    '-rf',
+                    '/tmp/cephtest/apache/tmp',
+                    run.Raw('&&'),
+                    'rmdir',
+                    '/tmp/cephtest/apache/htdocs',
+                    run.Raw('&&'),
+                    'rmdir',
+                    '/tmp/cephtest/apache',
+                    ],
+                )
+
+
+@contextlib.contextmanager
+def ship_config(ctx, config):
+    assert isinstance(config, list)
+    log.info('Shipping apache config and rgw.fcgi...')
+    src = os.path.join(os.path.dirname(__file__), 'apache.conf')
+    for client in config:
+        (remote,) = ctx.cluster.only(client).remotes.keys()
+        with file(src, 'rb') as f:
+            teuthology.write_file(
+                remote=remote,
+                path='/tmp/cephtest/apache/apache.conf',
+                data=f,
+                )
+        teuthology.write_file(
+            remote=remote,
+            path='/tmp/cephtest/apache/htdocs/rgw.fcgi',
+            data="""#!/bin/sh
+ulimit -c unlimited
+exec /tmp/cephtest/binary/usr/local/bin/radosgw -c /tmp/cephtest/ceph.conf
+"""
+            )
+        remote.run(
+            args=[
+                'chmod',
+                'a=rx',
+                '/tmp/cephtest/apache/htdocs/rgw.fcgi',
+                ],
+            )
+    try:
+        yield
+    finally:
+        log.info('Removing apache config...')
+        for client in config:
+            ctx.cluster.only(client).run(
+                args=[
+                    'rm',
+                    '-f',
+                    '/tmp/cephtest/apache/apache.conf',
+                    run.Raw('&&'),
+                    'rm',
+                    '-f',
+                    '/tmp/cephtest/apache/htdocs/rgw.fcgi',
+                    ],
+                )
+
+
+@contextlib.contextmanager
+def start_apache(ctx, config):
+    log.info('Starting apache...')
+    apaches = {}
+    for client in config:
+        (remote,) = ctx.cluster.only(client).remotes.keys()
+        proc = remote.run(
+            args=[
+                '/tmp/cephtest/enable-coredump',
+                '/tmp/cephtest/daemon-helper',
+                'kill',
+                'apache2',
+                '-X',
+                '-f',
+                '/tmp/cephtest/apache/apache.conf',
+                ],
+            logger=log.getChild(client),
+            stdin=run.PIPE,
+            wait=False,
+            )
+        apaches[client] = proc
+
+    try:
+        yield
+    finally:
+        log.info('Stopping apache...')
+        for client, proc in apaches.iteritems():
+            proc.stdin.close()
+
+        run.wait(apaches.itervalues())
+
+        # radosgw does not get shutdown with apache
+        for client in config:
+            ctx.cluster.only(client).run(
+                args=[
+                    'killall',
+                    'radosgw',
+                    ],
+                )
+
+
+@contextlib.contextmanager
+def task(ctx, config):
+    """
+    Spin up apache configured to run a rados gateway.
+    Only one should be run per machine, since it uses a hard-coded port for now.
+
+    For example, to run rgw on all clients::
+
+        tasks:
+        - ceph:
+        - rgw:
+
+    To only run on certain clients::
+
+        tasks:
+        - ceph:
+        - rgw: [client.0, client.3]
+    """
+    assert config is None or isinstance(config, list), \
+        "task rgw only supports a list of clients for configuration"
+    if config is None:
+        config = ['client.{id}'.format(id=id_)
+                  for id_ in teuthology.all_roles_of_type(ctx.cluster, 'client')]
+
+    for _, roles_for_host in ctx.cluster.remotes.iteritems():
+        running_rgw = False
+        for role in roles_for_host:
+            if role in config:
+                assert not running_rgw, "Only one client per host can run rgw."
+                running_rgw = True
+
+    with contextutil.nested(
+        lambda: create_dirs(ctx=ctx, config=config),
+        lambda: ship_config(ctx=ctx, config=config),
+        lambda: start_apache(ctx=ctx, config=config),
+        ):
+        yield