Increase the escalation prompt timeout

It was set to match the SSH connect timeout. Unfortunately, they would
race when ssh fails to connect, and the connect timeout usually failed.
This led to some misleading error messages.

Fixes #12916
This commit is contained in:
David M. Lee 2015-11-12 21:48:20 -06:00
parent 31b1abf580
commit 5bd096208c

View file

@ -392,7 +392,10 @@ class Connection(ConnectionBase):
become_error=False, become_nopasswd_error=False
)
timeout = self._play_context.timeout
# select timeout should be longer than the connect timeout, otherwise
# they will race each other when we can't connect, and the connect
# timeout usually fails
timeout = 2 + self._play_context.timeout
rpipes = [p.stdout, p.stderr]
for fd in rpipes:
fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)