From c3b53c326558dd3dd435c9e3fdbc07d8c15f4e68 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 22 Oct 2014 14:40:07 -0700 Subject: [PATCH] apache: switch to use the apache worker mpm Fixes: #9169 Signed-off-by: Yehuda Sadeh --- tasks/rgw.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/rgw.py b/tasks/rgw.py index 850bc82c3cc08..591a8a8cc68cc 100644 --- a/tasks/rgw.py +++ b/tasks/rgw.py @@ -12,6 +12,7 @@ from cStringIO import StringIO from teuthology.orchestra import run from teuthology import misc as teuthology from teuthology import contextutil +from teuthology.orchestra.run import CommandFailedError from util.rgw import rgwadmin from util.rados import (rados, create_ec_pool, create_replicated_pool, @@ -271,7 +272,17 @@ def start_apache(ctx, config): if system_type == 'deb': apache_name = 'apache2' else: - apache_name = '/usr/sbin/httpd' + try: + remote.run( + args=[ + 'stat', + '/usr/sbin/httpd.worker', + ], + ) + apache_name = '/usr/sbin/httpd.worker' + except CommandFailedError: + apache_name = '/usr/sbin/httpd' + proc = remote.run( args=[ 'adjust-ulimits', -- 2.39.5