diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-27 00:06:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-27 00:06:25 +0000 |
| commit | eb77c594183c5f78f210de07444b81c75bab5484 (patch) | |
| tree | 72e257fd08c2a31ca9163df821f2dddf4f32bc8b | |
| parent | 2ad346d0b44aac11cd11f028a324bed98e7c6ab2 (diff) | |
| parent | 7abc6ed4fa2da3207c8fe660186aa3ed01d271d4 (diff) | |
| download | swift-eb77c594183c5f78f210de07444b81c75bab5484.tar.gz | |
Merge "Catch more exceptions when recording progress" into feature/deep
| -rw-r--r-- | swift/container/sharder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swift/container/sharder.py b/swift/container/sharder.py index 1b4774417..c4d3f5a1f 100644 --- a/swift/container/sharder.py +++ b/swift/container/sharder.py @@ -1440,7 +1440,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) |