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

2 files changed, 10 insertions, 2 deletions

diff --git a/ipaserver/install/plugins/baseupdate.py b/ipaserver/install/plugins/baseupdate.py
index 227dc917..f91cf5de 100644
--- a/ipaserver/install/plugins/baseupdate.py
+++ b/ipaserver/install/plugins/baseupdate.py
@@ -34,6 +34,14 @@ class DSRestart(service.Service):
         """
         service.Service.__init__(self, "dirsrv")
 
+    def start(self, instance_name="", capture_output=True, wait=True):
+        """
+        During upgrades the server is listening only on the socket so
+        we don't want to wait on ports. The caller is responsible for
+        waiting for the socket to be ready.
+        """
+        super(DSRestart, self).start(wait=False)
+
     def create_instance(self):
         self.step("stopping directory server", self.stop)
         self.step("starting directory server", self.start)
diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py
index 10d899ab..e2376947 100644
--- a/ipaserver/install/plugins/updateclient.py
+++ b/ipaserver/install/plugins/updateclient.py
@@ -18,11 +18,11 @@
 #
 
 import os
-from ipaserver.install import installutils
 from ipaserver.install.plugins import FIRST, MIDDLE, LAST
 from ipaserver.install.plugins import POST_UPDATE
 from ipaserver.install.plugins.baseupdate import DSRestart
 from ipaserver.install.ldapupdate import LDAPUpdate
+from ipapython.ipautil import wait_for_open_socket
 from ipalib import api
 from ipalib import backend
 import ldap as _ldap
@@ -161,7 +161,7 @@ class updateclient(backend.Executioner):
         if live_run:
             self.destroy_context()
             dsrestart.create_instance()
-            installutils.wait_for_open_socket(socket_name)
+            wait_for_open_socket(socket_name)
             self.create_context(dm_password)
         else:
             self.log.warn("Test mode, skipping restart")