Commit 2696135b by James Cammarata

Display error during launch of accelerated daemon

* also minor tweak to the # of retries in the connection attempt

Fixes #4012
parent 8a016bb3
...@@ -74,7 +74,7 @@ class Connection(object): ...@@ -74,7 +74,7 @@ class Connection(object):
try: try:
if not self.is_connected: if not self.is_connected:
# TODO: make the timeout and retries configurable? # TODO: make the timeout and retries configurable?
tries = 10 tries = 3
self.conn = socket.socket() self.conn = socket.socket()
self.conn.settimeout(30.0) self.conn.settimeout(30.0)
while tries > 0: while tries > 0:
...@@ -91,6 +91,8 @@ class Connection(object): ...@@ -91,6 +91,8 @@ class Connection(object):
if allow_ssh: if allow_ssh:
vvv("Falling back to ssh to startup accelerated mode") vvv("Falling back to ssh to startup accelerated mode")
res = self._execute_fb_module() res = self._execute_fb_module()
if not res.is_successful():
raise errors.AnsibleError("Failed to launch the accelerated daemon on %s (reason: %s)" % (self.host,res.result.get('msg')))
return self.connect(allow_ssh=False) return self.connect(allow_ssh=False)
else: else:
raise errors.AnsibleError("Failed to connect to %s:%s" % (self.host,self.fbport)) raise errors.AnsibleError("Failed to connect to %s:%s" % (self.host,self.fbport))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment