ensure ssh retry respects no log (#49569)

pull/49707/head
Brian Coca 6 years ago committed by GitHub
parent 37820be05b
commit ba4c2ebeac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- now no log is being respected on retry and high verbosity

@ -332,11 +332,14 @@ def _ssh_retry(func):
try: try:
try: try:
return_tuple = func(self, *args, **kwargs) return_tuple = func(self, *args, **kwargs)
display.vvv(return_tuple, host=self.host) if self._play_context.no_log:
display.vvv('rc=%s, stdout & stderr censored due to no log' % return_tuple[0], host=self.host)
else:
display.vvv(return_tuple, host=self.host)
# 0 = success # 0 = success
# 1-254 = remote command return code # 1-254 = remote command return code
# 255 could be a failure from the ssh command itself # 255 could be a failure from the ssh command itself
except (AnsibleControlPersistBrokenPipeError) as e: except (AnsibleControlPersistBrokenPipeError):
# Retry one more time because of the ControlPersist broken pipe (see #16731) # Retry one more time because of the ControlPersist broken pipe (see #16731)
cmd = args[0] cmd = args[0]
if self._play_context.password and isinstance(cmd, list): if self._play_context.password and isinstance(cmd, list):
@ -354,8 +357,12 @@ def _ssh_retry(func):
break break
if SSH_ERROR: if SSH_ERROR:
raise AnsibleConnectionFailure("Failed to connect to the host via ssh: %s" msg = "Failed to connect to the host via ssh: "
% to_native(return_tuple[2])) if self._play_context.no_log:
msg += '<error censored due to no log>'
else:
msg += to_native(return_tuple[2])
raise AnsibleConnectionFailure(msg)
break break

Loading…
Cancel
Save