summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-10-17 11:17:07 (GMT)
committerMartin Kosek <mkosek@redhat.com>2011-10-24 13:10:45 (GMT)
commit109571d384a5a60e84ebc3235a77d6ce0a9233c5 (patch)
tree09d164aef8f9ae68fda50af57686c6e8faa5951c
parent25d5d7ed939384340c0aa7d00989cbddf4226bcd (diff)
downloadfreeipa-109571d384a5a60e84ebc3235a77d6ce0a9233c5.zip
freeipa-109571d384a5a60e84ebc3235a77d6ce0a9233c5.tar.gz
freeipa-109571d384a5a60e84ebc3235a77d6ce0a9233c5.tar.xz
Spin for connection success also when socket is not (yet) available
We were spinning for socket connection if attempt to connect returned errno 111 (connection refused). However, it is not enough for local AF_UNIX sockets as heavy applications might not be able to start yet and therefore the whole path might be missing. So spin for errno 2 (no such file or directory) as well. Partial fix for https://fedorahosted.org/freeipa/ticket/1990
-rw-r--r--ipaserver/install/installutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index ca9a826..4e6788c 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -508,7 +508,7 @@ def wait_for_open_socket(socket_name, timeout=0):
s.close()
break;
except socket.error, e:
- if e.errno == 111: # 111: Connection refused
+ if e.errno in (2,111): # 111: Connection refused, 2: File not found
if timeout and time.time() > op_timeout: # timeout exceeded
raise e
time.sleep(1)