diff options
author | George Kraft <george.kraft@calxeda.com> | 2013-10-01 15:13:33 -0500 |
---|---|---|
committer | George Kraft <george.kraft@calxeda.com> | 2013-10-01 15:13:33 -0500 |
commit | 25d3656b4837842e6b06a65e88a00a977eb3e198 (patch) | |
tree | 6191ae0aee94a6a03ed0aff2f01d2cdd2baf6a4c | |
parent | c38aa01a17663f0eeecfa209554aa77d293b0d9b (diff) | |
download | cxmanage-25d3656b4837842e6b06a65e88a00a977eb3e198.tar.gz |
CXMAN-225: Retry obtaining TftpServer port if we get a socket.error
Seems like a race that occurs between the main thread and
TftpServer thread.
-rw-r--r-- | cxmanage_api/tftp.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/cxmanage_api/tftp.py b/cxmanage_api/tftp.py index 0b33db8..91671cc 100644 --- a/cxmanage_api/tftp.py +++ b/cxmanage_api/tftp.py @@ -37,6 +37,7 @@ import socket import logging import traceback +from datetime import datetime, timedelta from tftpy import TftpClient, TftpServer, setLogLevel from threading import Thread from cxmanage_api import temp_dir @@ -74,10 +75,18 @@ class InternalTftp(Thread): self.port = port self.start() - # Get the port we actually hosted on (this covers the port=0 case) - while not self.server.sock: - pass - self.port = self.server.sock.getsockname()[1] + # Get the port we actually hosted on + if port == 0: + deadline = datetime.now() + timedelta(seconds=1) + while datetime.now() < deadline: + try: + self.port = self.server.sock.getsockname()[1] + break + except (AttributeError, socket.error): + pass + else: + # don't catch the error on our last attempt + self.port = self.server.sock.getsockname()[1] def run(self): """ Run the server. Listens indefinitely. """ |