diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-05-24 11:23:36 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-07-02 17:08:58 -0400 |
commit | e5b6260008a3a7132fdaef99d800406eb8872316 (patch) | |
tree | 9981186bd06f5574570f5743cba05cd0aa9ee963 /ipaserver/install/upgradeinstance.py | |
parent | 6fb802152add24aa1842f4adccf59b23850ab336 (diff) | |
download | freeipa-e5b6260008a3a7132fdaef99d800406eb8872316.tar.gz freeipa-e5b6260008a3a7132fdaef99d800406eb8872316.tar.xz freeipa-e5b6260008a3a7132fdaef99d800406eb8872316.zip |
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
Diffstat (limited to 'ipaserver/install/upgradeinstance.py')
-rw-r--r-- | ipaserver/install/upgradeinstance.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index b04d92afc..f1f702b1c 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) |