rgw: allow fastcgi idle timeout to be adjusted

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/apache.conf.template b/teuthology/task/apache.conf.template
index 8b21d650dc4716e1d4cf27283f5d72f09d0c69ed..100ed4e79dae155c6eaf97e376f2aef4dc5acad1 100644 (file)
--- a/teuthology/task/apache.conf.template
+++ b/teuthology/task/apache.conf.template
@@ -22,6 +22,7 @@ PidFile {testdir}/apache/tmp.{client}/apache.pid
 DocumentRoot {testdir}/apache/htdocs.{client}
 FastCgiIPCDir {testdir}/apache/tmp.{client}/fastcgi_sock
 FastCgiExternalServer {testdir}/apache/htdocs.{client}/rgw.fcgi -socket rgw_sock
+FastCgiConfig -idle-timeout {idle_timeout}
 RewriteEngine On
 
 RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /rgw.fcgi?page=$1&params=$2&%{{QUERY_STRING}} [E=HTTP_AUTHORIZATION:%{{HTTP:Authorization}},L]

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index f050baae6b39817d50c32d6c75d41170daee8f57..6076beaf1f19d5124f78ed93acdfd6417226a5b5 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -77,9 +77,10 @@ def ship_config(ctx, config, role_endpoints):
     testdir = teuthology.get_testdir(ctx)
     log.info('Shipping apache config and rgw.fcgi...')
     src = os.path.join(os.path.dirname(__file__), 'apache.conf.template')
-    for client in config.iterkeys():
+    for client, conf in config.iteritems():
         (remote,) = ctx.cluster.only(client).remotes.keys()
         system_type = teuthology.get_system_type(remote)
+        idle_timeout = conf.get('idle_timeout', 30)
         if system_type == 'deb':
             mod_path = '/usr/lib/apache2/modules'
             print_continue = 'on'
@@ -95,6 +96,7 @@ def ship_config(ctx, config, role_endpoints):
                 host=host,
                 port=port,
                 client=client,
+                idle_timeout=idle_timeout,
                 )
             teuthology.write_file(
                 remote=remote,
@@ -565,6 +567,14 @@ def task(ctx, config):
             client.0:
             client.3:
 
+    You can adjust the idle timeout for fastcgi (default is 30 seconds):
+
+        tasks:
+        - ceph:
+        - rgw:
+            client.0:
+              idle_timeout: 90
+
     To run radosgw through valgrind:
 
         tasks: