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/dsinstance.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ipaserver/install/dsinstance.py') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index d74ee898..9c137af0 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -416,7 +416,6 @@ class DsInstance(service.Service): if not is_ds_running(instance): root_logger.critical("Failed to restart the directory server. See the installation log for details.") sys.exit(1) - installutils.wait_for_open_ports('localhost', self.open_ports, 300) except SystemExit, e: raise e except Exception, e: @@ -667,7 +666,7 @@ class DsInstance(service.Service): # (re)start them. for ds_instance in get_ds_instances(): try: - ipaservices.knownservices.dirsrv.restart(ds_instance) + ipaservices.knownservices.dirsrv.restart(ds_instance, wait=False) except Exception, e: root_logger.error('Unable to restart ds instance %s: %s', ds_instance, e) -- cgit