summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/cainstance.py
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-03-14 17:56:17 +0100
committerRob Crittenden <rcritten@redhat.com>2011-03-21 14:31:08 -0400
commit18542cd165d047cba69ed2b3ac12e59993bf2fb0 (patch)
treeaf1e88fc5380dcc40d124b358a4466654d3b04bb /ipaserver/install/cainstance.py
parentca5332951c68904b0763f79f3612209271206b2a (diff)
downloadfreeipa-18542cd165d047cba69ed2b3ac12e59993bf2fb0.tar.gz
freeipa-18542cd165d047cba69ed2b3ac12e59993bf2fb0.tar.xz
freeipa-18542cd165d047cba69ed2b3ac12e59993bf2fb0.zip
Wait for Directory Server ports to open
When Directory Server operation is run right after the server restart the listening ports may not be opened yet. This makes the installation fail. This patch fixes this issue by waiting for both secure and insecure Directory Server ports to open after every restart. https://fedorahosted.org/freeipa/ticket/1076
Diffstat (limited to 'ipaserver/install/cainstance.py')
-rw-r--r--ipaserver/install/cainstance.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 83f3aa7b9..2ada2b732 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -733,18 +733,7 @@ class CAInstance(service.Service):
def __restart_instance(self):
try:
self.restart()
- # Wait until the dogtag webapp responds
- while True:
- try:
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect(('localhost', 9180))
- s.close()
- break
- except socket.error, e:
- if e.errno == 111: # Connection refused
- time.sleep(1)
- else:
- raise e
+ installutils.wait_for_open_ports('localhost', 9180, 300)
except Exception:
# TODO: roll back here?
logging.critical("Failed to restart the certificate server. See the installation log for details.")