From 9e08f1ead2988d1bbb54e193bdd7dfd6118b68f3 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 23 Jul 2020 08:04:42 -0600 Subject: [PATCH] [TRAIN-and-older] Properly close sockets Currently we properly close the ipv4 socket when we're check for nodes to become available. This change adds additional closes to ensure we clean up the sockets when we're done with them while we wait. Note this code was removed in Ussuri so this is a <= train only patch Change-Id: Ie1711972e2fdb2af80b50a2bf514fc46151ae4f3 Closes-Bug: #1888676 --- tripleoclient/workflows/deployment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 8e49e8cd9..550b16ab3 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -178,12 +178,14 @@ def wait_for_ssh_port(host, timeout=ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT): return except socket.error: try: + # close previous socket before creating a new one + sock.close() sock = socket.socket(socket.AF_INET6) sock.connect((host, 22)) sock.close() return except socket.error: - pass + sock.close() time.sleep(1)