From 69322c06e8fd9f21867a9c7aa04f990be47536df Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Tue, 23 Feb 2016 10:37:47 +0100 Subject: [PATCH] fix upgrade: wait for proper DS socket after DS restart DS restart executed by upgrade plugin causes that upgrade framework is waiting for the improper socket. It leads to TimeoutError because DS is not listening on 389 port during upgrade. This commit fixes the issue. Required for: https://fedorahosted.org/freeipa/ticket/5665 Reviewed-By: Alexander Bokovoy Reviewed-By: Tomas Babej --- ipaserver/install/ldapupdate.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 6f796dfdc8bbac1bb99a8b5a1bd5a6aaa778db16..0e258612d3060188212fdd2625d7e62b5cb14ebf 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -44,7 +44,6 @@ from ipaplatform.paths import paths from ipaplatform import services from ipapython.dn import DN from ipapython.ipa_log_manager import * -from ipapython.ipautil import wait_for_open_socket UPDATES_DIR=paths.UPDATES_DIR @@ -932,5 +931,4 @@ class LDAPUpdate: def restart_ds(self): dirsrv = services.knownservices.dirsrv self.log.debug('Restarting directory server to apply updates') - dirsrv.restart() - wait_for_open_socket(self.socket_name) + dirsrv.restart(ldapi=self.ldapi) -- 2.5.0