Wait for memberof task and DS to start before proceeding in installation.

This was causing a replica DS instance to crash if the task was not
completed when we attempted a shutdown to do a restart.

In replication.py we were restarting the DS instance without waiting
for the ports to become available.

It is unlikely that the dn of the memberof task will change but just in
case I noted it in the two places it is referenced.

ticket 1188

3 files changed, 32 insertions, 0 deletions

diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 554126434..38195c72c 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -427,6 +427,13 @@ class DsInstance(service.Service):
 
     def init_memberof(self):
         self._ldap_mod("memberof-task.ldif", self.sub_dict)
+        # Note, keep dn in sync with dn in install/share/memberof-task.ldif
+        dn = "cn=IPA install %s,cn=memberof task,cn=tasks,cn=config" % self.sub_dict["TIME"]
+        logging.debug("Waiting for memberof task to complete.")
+        conn = ipaldap.IPAdmin("127.0.0.1")
+        conn.simple_bind_s("cn=directory manager", self.dm_password)
+        conn.checkTask(dn, dowait=True)
+        conn.unbind()
 
     def apply_updates(self):
         ld = ldapupdate.LDAPUpdate(dm_password=self.dm_password, sub_dict=self.sub_dict)
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 1dc112b27..3712d1c3e 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -23,6 +23,7 @@ import os
 import ldap
 from ipaserver import ipaldap
 from ipaserver.install.service import restart
+import installutils
 from ldap import modlist
 from ipalib import util
 from ipalib import errors
@@ -69,6 +70,7 @@ def enable_replication_version_checking(hostname, realm, dirman_passwd):
         conn.unbind()
         serverid = "-".join(realm.split("."))
         restart("dirsrv", instance_name=serverid)
+        installutils.wait_for_open_ports('localhost', [389, 636], 300)
     else:
         conn.unbind()
 
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index b933839ab..7df7cceff 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -641,6 +641,29 @@ class IPAdmin(SimpleLDAPObject):
 
         return entry
 
+    def checkTask(self, dn, dowait=False, verbose=False):
+        """check task status - task is complete when the nsTaskExitCode attr
+           is set return a 2 tuple (true/false,code) first is false if task is
+           running, true if done - if true, second is the exit code - if dowait
+           is True, this function will block until the task is complete
+        """
+        attrlist = ['nsTaskLog', 'nsTaskStatus', 'nsTaskExitCode', 'nsTaskCurrentItem', 'nsTaskTotalItems']
+        done = False
+        exitCode = 0
+        while not done:
+            try:
+                entry = self.getEntry(dn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist)
+            except errors.NotFound:
+                break
+            if verbose:
+                print entry
+            if entry.nsTaskExitCode:
+                exitCode = int(entry.nsTaskExitCode)
+                done = True
+            if dowait: time.sleep(1)
+            else: break
+        return (done, exitCode)
+
     def normalizeDN(dn):
         # not great, but will do until we use a newer version of python-ldap
         # that has DN utilities