rgw: turn off continue print on centos

Also note that a ceph.conf setting is needed for that too

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/teuthology/task/apache.conf.template b/teuthology/task/apache.conf.template
index 397b1d1ad1910e3c645ba66995eb43a188cb98f5..a6083d660bd159704d1ac030b89f45779d428831 100644 (file)
--- a/teuthology/task/apache.conf.template
+++ b/teuthology/task/apache.conf.template
@@ -21,8 +21,8 @@ RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /rgw.fcgi?page=$1&params=$2&%{{QUERY_STR
 # Set fastcgi environment variables.
 # Note that this is separate from Unix environment variables!
 SetEnv RGW_LOG_LEVEL 20
-SetEnv RGW_PRINT_CONTINUE yes
 SetEnv RGW_SHOULD_LOG yes
+SetEnv RGW_PRINT_CONTINUE {print_continue}
 
 <Directory {testdir}/apache/htdocs>
   Options +ExecCGI

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index ddac2915c912e750f4ce2057435c26d5b357c59d..19d851b221c66f53d12d358d33e6faa8f6e0cb7c 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -56,12 +56,15 @@ def ship_config(ctx, config):
         system_type = teuthology.get_system_type(remote)
         if system_type == 'deb':
             mod_path = '/usr/lib/apache2/modules'
+            print_continue = 'on'
         else:
             mod_path = '/usr/lib64/httpd/modules'
+            print_continue = 'off'
         with file(src, 'rb') as f:
             conf = f.read().format(
                 testdir=testdir,
                 mod_path=mod_path,
+                print_continue=print_continue,
                 )
             teuthology.write_file(
                 remote=remote,
@@ -242,6 +245,15 @@ def task(ctx, config):
             client.3:
               valgrind: [--tool=memcheck]
 
+    Note that without a modified fastcgi module e.g. with the default
+    one on CentOS, you must have rgw print continue = false in ceph.conf::
+
+        tasks:
+        - ceph:
+            conf:
+              global:
+                rgw print continue: false
+        - rgw: [client.0]
     """
     if config is None:
         config = dict(('client.{id}'.format(id=id_), None)