canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+464739@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:more-exceptions-worker-put-object into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464739
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:more-exceptions-worker-put-object into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index bfa35e7..32ce708 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -29,6 +29,7 @@ from urllib.error import HTTPError
 
 import amqplib.client_0_8 as amqp
 import distro_info
+import requests
 import swiftclient
 import systemd.journal
 from influxdb import InfluxDBClient
@@ -1386,7 +1387,10 @@ def request(msg):
                             content_length=os.path.getsize(path),
                         )
                         break
-                    except swiftclient.exceptions.ClientException as e:
+                    except (
+                        swiftclient.exceptions.ClientException,
+                        requests.exceptions.ConnectionError,
+                    ) as e:
                         if retry > 0:
                             logging.info(
                                 "Failed to upload %s to swift (%s), retrying in %s seconds..."