wait_for: treat broken connections as "unready" (#28839)
* wait_for: treat broken connections as "unready" We have observed the following condition while waiting for hosts: ``` Traceback (most recent call last): File "/var/folders/f8/23xp00654plcv2b2tcc028680000gn/T/ansible_8hxm4_/ansible_module_wait_for.py", line 585, in <module> main() File "/var/folders/f8/23xp00654plcv2b2tcc028680000gn/T/ansible_8hxm4_/ansible_module_wait_for.py", line 535, in main s.shutdown(socket.SHUT_RDWR) File "/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/python2.7/socket.py", line 228, in meth return getattr(self._sock,name)(*args) socket.error: [Errno 57] Socket is not connected ``` This appears to happen while the host is still starting; we believe something is accepting our connection but immediately resetting it. In these cases, we'd prefer to continue waiting instead of immediately failing the play. This patch has been applied locally for some time, and we have seen no adverse effects. * wait_for: fixup change We were missing an import and a space after the `#`
This commit is contained in:
parent
79f2cfbcf9
commit
402b095841
1 changed files with 17 additions and 4 deletions
|
@ -168,6 +168,7 @@ EXAMPLES = r'''
|
||||||
|
|
||||||
import binascii
|
import binascii
|
||||||
import datetime
|
import datetime
|
||||||
|
import errno
|
||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
@ -558,14 +559,26 @@ def main():
|
||||||
break
|
break
|
||||||
|
|
||||||
# Shutdown the client socket
|
# Shutdown the client socket
|
||||||
|
try:
|
||||||
s.shutdown(socket.SHUT_RDWR)
|
s.shutdown(socket.SHUT_RDWR)
|
||||||
|
except socket.error as e:
|
||||||
|
if e.errno != errno.ENOTCONN:
|
||||||
|
raise
|
||||||
|
# else, the server broke the connection on its end, assume it's not ready
|
||||||
|
else:
|
||||||
s.close()
|
s.close()
|
||||||
if matched:
|
if matched:
|
||||||
# Found our string, success!
|
# Found our string, success!
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
# Connection established, success!
|
# Connection established, success!
|
||||||
|
try:
|
||||||
s.shutdown(socket.SHUT_RDWR)
|
s.shutdown(socket.SHUT_RDWR)
|
||||||
|
except socket.error as e:
|
||||||
|
if e.errno != errno.ENOTCONN:
|
||||||
|
raise
|
||||||
|
# else, the server broke the connection on its end, assume it's not ready
|
||||||
|
else:
|
||||||
s.close()
|
s.close()
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue