From 7abc6ed4fa2da3207c8fe660186aa3ed01d271d4 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Thu, 26 Apr 2018 19:43:41 +0000
Subject: [PATCH] Catch more exceptions when recording progress

Change-Id: Idcca56ab2f42dcadb5b3a2194bda16c8dc451f71
---
 swift/container/sharder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swift/container/sharder.py b/swift/container/sharder.py
index cf51a1842d..2ef7778fe6 100644
--- a/swift/container/sharder.py
+++ b/swift/container/sharder.py
@@ -1429,7 +1429,7 @@ class ContainerSharder(ContainerReplicator):
                     'Unhandled exception while processing %s: %s', path, error)
             try:
                 self._record_sharding_progress(broker, node, error)
-            except Exception as error:
+            except (Exception, Timeout) as error:
                 self.logger.exception(
                     'Unhandled exception while dumping progress for %s: %s',
                     path, error)