From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 15 Nov 2016 19:42:23 +0000 (-0500)
Subject: rgw: remove unnecessary sleeps
X-Git-Tag: v10.2.6~165^2^2~18^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23ea2580a6882ec42290da7579d62d485d32b474;p=ceph.git

rgw: remove unnecessary sleeps

remove the sleeps that were added to address radosgw startup races

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3e68bfdbb29e933edb06f73c88eed176ffacc2e3)
---

diff --git a/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml b/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
index 33322b1dafac..328641ea0a12 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 10dc1d80553e..8e1c7194e01c 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 fba726c7d219..611a0ddcb3ad 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 c1194e6116f1..b39fa10ea6b8 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,