From 0accf8ccb64963954dbe7c137d23f52e5901ac4f 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: Tomas Babej Reviewed-By: Alexander Bokovoy --- 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 95e35f697..32fa4e25b 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -43,7 +43,6 @@ from ipaplatform.paths import paths from ipaplatform import services from ipapython.dn import DN from ipapython.ipa_log_manager import log_mgr -from ipapython.ipautil import wait_for_open_socket if six.PY3: unicode = str @@ -945,5 +944,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)