From c56ab97442bbf61ad84526580bf773b324a05066 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 6 Oct 2011 17:18:35 -0700 Subject: [PATCH] reconnect: ignore SSHExceptions before the timeout expires Fixes: #1587 --- teuthology/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 601af35ef2212..cf090f529a728 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -4,6 +4,7 @@ import os import logging import configobj import getpass +import paramiko import socket import time import urllib2 @@ -325,6 +326,7 @@ def reconnect(ctx, timeout): while True: for remote in list(need_reconnect): try: + log.info('trying to connect to %s', remote.name) from .orchestra import connection remote.ssh = connection.connect( user_at_host=remote.name, @@ -340,11 +342,13 @@ def reconnect(ctx, timeout): raise else: if time.time() - starttime > timeout: - log.exception('timed out waiting for %s', remote.name) raise else: log.exception('weird socket error without error code') raise + except paramiko.SSHException: + if time.time() - starttime > timeout: + raise else: need_reconnect.remove(remote) -- 2.39.5