From 6440750f539c1f14c252db43de06ae11b254f778 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 7 Mar 2017 17:31:52 +0100 Subject: [PATCH] qa/tasks/rgw.py: start Apache before RadosGW. At the end of start_rgw() we wait till establishing HTTP connections with RadosGW become possible. However, if RadosGW uses the FastCGI, the condition can't be fulfilled without spawning HTTP server first. Signed-off-by: Radoslaw Zarzynski --- qa/tasks/rgw.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index c8da3629c7d..254c5294c84 100644 --- a/qa/tasks/rgw.py +++ b/qa/tasks/rgw.py @@ -1305,8 +1305,8 @@ def task(ctx, config): subtasks.extend([ lambda: ship_apache_configs(ctx=ctx, config=config, role_endpoints=role_endpoints, on_client=master_client), - lambda: start_rgw(ctx=ctx, config=config, on_client=master_client), lambda: start_apache(ctx=ctx, config=config, on_client=master_client), + lambda: start_rgw(ctx=ctx, config=config, on_client=master_client), ]) elif ctx.rgw.frontend == 'civetweb': subtasks.extend([ @@ -1345,15 +1345,15 @@ def task(ctx, config): on_client=None, except_client = master_client, ), - lambda: start_rgw(ctx=ctx, - config=config, - on_client=None, - except_client = master_client), lambda: start_apache(ctx=ctx, config = config, on_client=None, except_client = master_client, ), + lambda: start_rgw(ctx=ctx, + config=config, + on_client=None, + except_client = master_client), ]) elif ctx.rgw.frontend == 'civetweb': subtasks.extend([ @@ -1386,9 +1386,9 @@ def task(ctx, config): subtasks.extend([ lambda: ship_apache_configs(ctx=ctx, config=config, role_endpoints=role_endpoints), + lambda: start_apache(ctx=ctx, config=config), lambda: start_rgw(ctx=ctx, config=config), - lambda: start_apache(ctx=ctx, config=config), ]) elif ctx.rgw.frontend == 'civetweb': subtasks.extend([