IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix upgrade: wait for proper DS socket after DS restart

Browse Source 
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 <abokovoy@redhat.com>
Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Martin Basti
2016-02-23 10:37:47 +01:00
parent 7dd4a7a071
commit 4734012c80
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipaserver/install/ldapupdate.py
View File

@@ -44,7 +44,6 @@ from ipaplatform.paths import paths
from ipaplatform import services from ipaplatform import services
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.ipa_log_manager import * from ipapython.ipa_log_manager import *
from ipapython.ipautil import wait_for_open_socket
if six.PY3: if six.PY3:
unicode = str unicode = str
@@ -946,5 +945,4 @@ class LDAPUpdate:
def restart_ds(self): def restart_ds(self):
dirsrv = services.knownservices.dirsrv dirsrv = services.knownservices.dirsrv
self.log.debug('Restarting directory server to apply updates') self.log.debug('Restarting directory server to apply updates')
dirsrv.restart() dirsrv.restart(ldapi=self.ldapi)
wait_for_open_socket(self.socket_name)