]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge branch 'execute_command_retry_logic_if_command_fails_with_connection_error... wip-adk-testing-2025-12-10-2318
authorAdam King <adking@redhat.com>
Thu, 11 Dec 2025 04:18:17 +0000 (23:18 -0500)
committerAdam King <adking@redhat.com>
Thu, 11 Dec 2025 04:18:17 +0000 (23:18 -0500)
Conflicts:
src/pybind/mgr/cephadm/ssh.py

1  2 
src/pybind/mgr/cephadm/ssh.py

index 93db67135a081601ba0ad21b4e5259026edde2f1,95a06e0d8727550c8d8341ce608a5abd20f8c1b6..571af786ffb7bf506be90e86fac34dee1570b013
@@@ -204,11 -244,9 +245,11 @@@ class SSHManager
              raise HostConnectionError(msg, host, addr)
          except asyncssh.Error as e:
              self.mgr.offline_hosts.add(host)
 -            log_content = log_string.getvalue()
 -            msg = f'Failed to connect to {host} ({addr}). {str(e)}' + '\n' + f'Log: {log_content}'
 +            log_content = ''
 +            if asyncssh_logger.getEffectiveLevel() == logging.DEBUG:
 +                log_content = '\n' + f'Log: {log_string.getvalue()}'
 +            msg = f'Failed to connect to {host} ({addr}). {str(e)}{log_content}'
-             logger.debug(msg)
+             logger.exception(msg)
              raise HostConnectionError(msg, host, addr)
          except Exception as e:
              self.mgr.offline_hosts.add(host)