URL: https://github.com/freeipa/freeipa/pull/1017 Author: stlaz Title: #1017: Backport PR 945 to ipa-4-5 Action: opened
PR body: """ This PR was opened automatically because PR #945 was pushed to master and backport to ipa-4-5 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1017/head:pr1017 git checkout pr1017
From 69f644985af4f0950a3b75cb106480620f19457e Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Fri, 28 Jul 2017 15:43:16 +0200 Subject: [PATCH] DNS update: reduce timeout for CA records MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Timeout 120 seconds is quite long and it makes uninstallation too long for. Given that this is non critical operation and may be executed manually later, waiting 120 seconds is too much. Usually waiting longer will not help at all to resolve missing record. 30 seconds is long enough 🕯 https://pagure.io/freeipa/issue/6176 --- ipaserver/dns_data_management.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ipaserver/dns_data_management.py b/ipaserver/dns_data_management.py index d4dc42e473..2008ba6e7d 100644 --- a/ipaserver/dns_data_management.py +++ b/ipaserver/dns_data_management.py @@ -52,6 +52,8 @@ (DNSName("_ntp._udp"), 123), ) +CA_RECORDS_DNS_TIMEOUT = 30 # timeout in seconds + class IPADomainIsNotManagedByIPAError(Exception): pass @@ -131,7 +133,7 @@ def __add_ca_records_from_hostname(self, zone_obj, hostname): assert isinstance(hostname, DNSName) and hostname.is_absolute() r_name = DNSName('ipa-ca') + self.domain_abs rrsets = [] - end_time = time() + 120 # timeout in seconds + end_time = time() + CA_RECORDS_DNS_TIMEOUT while time() < end_time: try: rrsets = resolve_rrsets(hostname, (rdatatype.A, rdatatype.AAAA))
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
