From 3bf0ee3a4128dc538183ee8e45bc22a3966cfd4b Mon Sep 17 00:00:00 2001

From: Christian Heimes <cheimes@redhat.com>

Date: Fri, 22 Jun 2018 10:00:24 +0200

Subject: [PATCH] Use common replication wait timeout of 5min

Instead of multiple timeout values all over the code base, all

replication waits now use a common timeout value from api.env of 5

minutes. Waiting for HTTP/replica principal takes 90 to 120 seconds, so

5 minutes seem like a sufficient value for slow setups.

Fixes: https://pagure.io/freeipa/issue/7595

Signed-off-by: Christian Heimes <cheimes@redhat.com>

Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>

---

 ipalib/constants.py                   |  2 ++

 ipaserver/install/custodiainstance.py |  4 +++-

 ipaserver/install/httpinstance.py     |  6 +++++-

 ipaserver/install/krbinstance.py      | 13 ++++++++-----

 ipaserver/install/replication.py      |  6 ++++--

 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ipalib/constants.py b/ipalib/constants.py

index ab466bab7fc17a563a849e2cd9bb89515caff77b..b6a79ce716b3ee0f832390f5bc895c3bb9d37e33 100644

--- a/ipalib/constants.py

+++ b/ipalib/constants.py

@@ -142,6 +142,8 @@ DEFAULT_CONFIG = (

     ('startup_timeout', 300),

     # How long http connection should wait for reply [seconds].

     ('http_timeout', 30),

+    # How long to wait for an entry to appear on a replica

+    ('replication_wait_timeout', 300),

     # Web Application mount points

     ('mount_ipa', '/ipa/'),

diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py

index ada8d03a6914e19c186264f68178cce2442945ca..b37032974e4825a3f3043929171533e4d94730e9 100644

--- a/ipaserver/install/custodiainstance.py

+++ b/ipaserver/install/custodiainstance.py

@@ -4,6 +4,7 @@ from __future__ import print_function, absolute_import

 import enum

+from ipalib import api

 from ipaserver.secrets.kem import IPAKEMKeys, KEMLdap

 from ipaserver.secrets.client import CustodiaClient

 from ipaplatform.paths import paths

@@ -190,7 +191,8 @@ class CustodiaInstance(SimpleServiceInstance):

         cli = self._get_custodia_client()

         cli.fetch_key('dm/DMHash')

-    def _wait_keys(self, timeout=300):

+    def _wait_keys(self):

+        timeout = api.env.replication_wait_timeout

         deadline = int(time.time()) + timeout

         root_logger.info("Waiting up to %s seconds to see our keys "

                          "appear on host %s", timeout, self.ldap_uri)

diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py

index 434c2549dd868554735f4bcedc4cdceb23eeccdd..e68bfc09b34e087dfb4872b6565b06c6c2188384 100644

--- a/ipaserver/install/httpinstance.py

+++ b/ipaserver/install/httpinstance.py

@@ -617,4 +617,8 @@ class HTTPInstance(service.Service):

                 else:

                     remote_ldap.simple_bind(ipaldap.DIRMAN_DN,

                                             self.dm_password)

-                replication.wait_for_entry(remote_ldap, service_dn, timeout=60)

+                replication.wait_for_entry(

+                    remote_ldap,

+                    service_dn,

+                    timeout=api.env.replication_wait_timeout

+                )

diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py

index 34fe46aa8ef297bf69eb74953c956ad9c3d30def..5971a30fc566f6e96ce0b08632772d33da5602d2 100644

--- a/ipaserver/install/krbinstance.py

+++ b/ipaserver/install/krbinstance.py

@@ -390,13 +390,16 @@ class KrbInstance(service.Service):

     def _wait_for_replica_kdc_entry(self):

         master_dn = self.api.Object.server.get_dn(self.fqdn)

         kdc_dn = DN(('cn', 'KDC'), master_dn)

-

-        ldap_uri = 'ldap://{}'.format(self.master_fqdn)

-

+        ldap_uri = ipaldap.get_ldap_uri(self.master_fqdn)

         with ipaldap.LDAPClient(

-                ldap_uri, cacert=paths.IPA_CA_CRT) as remote_ldap:

+                ldap_uri, cacert=paths.IPA_CA_CRT, start_tls=True

+        ) as remote_ldap:

             remote_ldap.gssapi_bind()

-            replication.wait_for_entry(remote_ldap, kdc_dn, timeout=60)

+            replication.wait_for_entry(

+                remote_ldap,

+                kdc_dn,

+                timeout=api.env.replication_wait_timeout

+            )

     def _call_certmonger(self, certmonger_ca='IPA'):

         subject = str(DN(('cn', self.fqdn), self.subject_base))

diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py

index 5a491f248236c8d2166484d0db2acccb28ccf178..c017764468674830670a817b3d815c5e2d78728e 100644

--- a/ipaserver/install/replication.py

+++ b/ipaserver/install/replication.py

@@ -172,7 +172,7 @@ def wait_for_task(conn, dn):

     return exit_code

-def wait_for_entry(connection, dn, timeout=7200, attr=None, attrvalue='*',

+def wait_for_entry(connection, dn, timeout, attr=None, attrvalue='*',

                    quiet=True):

     """Wait for entry and/or attr to show up

     """

@@ -799,7 +799,9 @@ class ReplicationManager(object):

             # that we will have to set the memberof fixup task

             self.need_memberof_fixup = True

-        wait_for_entry(a_conn, entry.dn)

+        wait_for_entry(

+            a_conn, entry.dn, timeout=api.env.replication_wait_timeout

+        )

     def needs_memberof_fixup(self):

         return self.need_memberof_fixup

-- 

2.17.1