summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-24 01:14:19 +0000
committerGerrit Code Review <review@openstack.org>2018-04-24 01:14:19 +0000
commit8491ff237f20d8fa6b4b7765aef5f6552fd318fd (patch)
treedc523aad9ffa076e8e8e217b913f8b8b63d3c122
parent2559066f950cfe423eeb8b59afbd7b5c76938400 (diff)
parent429ca63c6067e6755ffc9cc8f69e869232ca6d8a (diff)
downloadswift-8491ff237f20d8fa6b4b7765aef5f6552fd318fd.tar.gz
Merge "Remove TODO re find_local_handoff_for_part returning None" into feature/deep
-rw-r--r--swift/container/sharder.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/swift/container/sharder.py b/swift/container/sharder.py
index 4fc0159d8..6deec620a 100644
--- a/swift/container/sharder.py
+++ b/swift/container/sharder.py
@@ -454,11 +454,9 @@ class ContainerSharder(ContainerReplicator):
part = self.ring.get_part(shard_range.account, shard_range.container)
node = self.find_local_handoff_for_part(part)
if not node:
- # TODO: and when *do* we cleave? maybe we should just be picking
- # one of the local devs
raise DeviceUnavailable(
- 'No mounted devices found suitable to Handoff sharded '
- 'container %s in partition %s' % (shard_range.name, part))
+ 'No mounted devices found suitable for creating shard broker'
+ 'for %s in partition %s' % (shard_range.name, part))
shard_broker = self._initialize_broker(
node['device'], part, shard_range.account, shard_range.container,