From 3e68bfdbb29e933edb06f73c88eed176ffacc2e3 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 15 Nov 2016 14:42:23 -0500 Subject: [PATCH] rgw: remove unnecessary sleeps remove the sleeps that were added to address radosgw startup races Signed-off-by: Casey Bodley --- suites/rgw/singleton/all/radosgw-admin-data-sync.yaml | 2 -- suites/rgw/singleton/all/radosgw-admin-multi-region.yaml | 2 -- suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml | 2 -- tasks/rgw.py | 7 ------- 4 files changed, 13 deletions(-) diff --git a/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml b/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml index 33322b1dafa..328641ea0a1 100644 --- a/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml +++ b/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml @@ -50,8 +50,6 @@ tasks: name: client1-system-user access key: 1te6NH5mcdcq0Tc5i8i3 secret key: Py4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXw -- sleep: - duration: 15 - radosgw-agent: client.0: max-entries: 10 diff --git a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml index 10dc1d80553..8e1c7194e01 100644 --- a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml +++ b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml @@ -55,8 +55,6 @@ tasks: name: client1-system-user access key: 1te6NH5mcdcq0Tc5i8i3 secret key: Py4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXw -- sleep: - duration: 5 - radosgw-agent: client.0: src: client.0 diff --git a/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml b/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml index a94fa3662f6..404d4860b6b 100644 --- a/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml +++ b/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml @@ -51,8 +51,6 @@ tasks: name: client1-system-user access key: 0te6NH5mcdcq0Tc5i8i2 secret key: Oy4IOauQoL18Gp2zM7lC1vLmoawgqcYPbYGcWfXv -- sleep: - duration: 5 - radosgw-agent: client.0: src: client.0 diff --git a/tasks/rgw.py b/tasks/rgw.py index c1194e6116f..b39fa10ea6b 100644 --- a/tasks/rgw.py +++ b/tasks/rgw.py @@ -1032,12 +1032,6 @@ def pull_configuration(ctx, config, regions, role_endpoints, realm, master_clien yield -@contextlib.contextmanager -def wait_for_master(): - log.debug("wait_for_master") - time.sleep(20) - yield - @contextlib.contextmanager def task(ctx, config): """ @@ -1296,7 +1290,6 @@ def task(ctx, config): else: raise ValueError("frontend must be 'apache' or 'civetweb'") - subtasks.extend([lambda: wait_for_master(),]) subtasks.extend([ lambda: pull_configuration(ctx=ctx, config=config, -- 2.39.5