From 701ea97750f36b1a5161a6302904b681f833b44b Mon Sep 17 00:00:00 2001 From: Michael Youngstrom Date: Thu, 1 Aug 2019 14:21:24 -0400 Subject: [PATCH] Add boto3 retry to xdist script (#21271) --- scripts/xdist/pytest_worker_manager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/xdist/pytest_worker_manager.py b/scripts/xdist/pytest_worker_manager.py index 713ee9fe9a..134f604ad2 100644 --- a/scripts/xdist/pytest_worker_manager.py +++ b/scripts/xdist/pytest_worker_manager.py @@ -83,7 +83,11 @@ class PytestWorkerManager(): ip_addresses = [] all_running = False for attempt in range(0, self.WORKER_BOOTUP_TIMEOUT_MINUTES * 12): - list_workers_response = self.ec2.describe_instances(InstanceIds=not_running) + try: + list_workers_response = self.ec2.describe_instances(InstanceIds=not_running) + except: + logger.info("Exception hit trying to describe instances.") + continue del not_running[:] for reservations in list_workers_response['Reservations']: for instance_info in reservations['Instances']: