openstack/swift
Code Issues Proposed changes

Merge "Fix crash in swift-ring-builder's list_parts command."

Browse Source
This commit is contained in:
Jenkins
2013-03-18 18:25:51 +00:00
committed by Gerrit Code Review
parent c2f8f00a3e 229ba53a19
commit 7b03ca15b2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/ring/builder.py
View File

@@ -937,6 +937,8 @@ class RingBuilder(object):
Deliberately includes duplicates. Deliberately includes duplicates.
""" """
if self._replica2part2dev is None:
return []
return [self.devs[part2dev[part]] return [self.devs[part2dev[part]]
for part2dev in self._replica2part2dev for part2dev in self._replica2part2dev
if part < len(part2dev)] if part < len(part2dev)]

2
test/unit/common/ring/test_builder.py
View File

@@ -797,6 +797,8 @@ class TestRingBuilder(unittest.TestCase):
def test_get_part_devices(self): def test_get_part_devices(self):
rb = ring.RingBuilder(8, 3, 1) rb = ring.RingBuilder(8, 3, 1)
self.assertEqual(rb.get_part_devices(0), [])
rb.add_dev({'id': 0, 'region': 0, 'zone': 0, 'weight': 1, rb.add_dev({'id': 0, 'region': 0, 'zone': 0, 'weight': 1,
'ip': '127.0.0.1', 'port': 10000, 'device': 'sda1'}) 'ip': '127.0.0.1', 'port': 10000, 'device': 'sda1'})
rb.add_dev({'id': 1, 'region': 0, 'zone': 1, 'weight': 1, rb.add_dev({'id': 1, 'region': 0, 'zone': 1, 'weight': 1,