From e5b6260008a3a7132fdaef99d800406eb8872316 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 24 May 2012 11:23:36 -0400 Subject: Centralize timeout for waiting for servers to start. All service start/restart currently go through ipapython/platform so move the "wait for service to start" code there as well. A dictionary of known services and ports to wait on is defined in base.py This is referenced by the platforms by instance name to determine what to wait for. For the case of dirsrv if we get that as a plain name (no specific instance) it is assumed to be the main IPA service. https://fedorahosted.org/freeipa/ticket/2375 https://fedorahosted.org/freeipa/ticket/2610 --- ipaserver/install/upgradeinstance.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipaserver/install/upgradeinstance.py') diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index b04d92af..f1f702b1 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -60,6 +60,11 @@ class IPAUpgrade(service.Service): self.badsyntax = False self.upgradefailed = False + def start(self, instance_name="", capture_output=True, wait=True): + # Don't wait here because we've turned off port 389. The connection + # we make will wait for the socket. + super(IPAUpgrade, self).start(instance_name, capture_output, wait=False) + def create_instance(self): self.step("stopping directory server", self.stop) self.step("saving configuration", self.__save_config) -- cgit