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