openstack/swift
Code Issues Proposed changes

Small minor fixes for composite ring functionality

Browse Source 
This is a follow up for https://review.openstack.org/#/c/441921
all of this patch is for minor fixes, I found in my self-review.

Change-Id: Ib3a1dc983c3da69dea592114e25a5047ec91a2b9
This commit is contained in:
Kota Tsuyuzaki
2017-05-18 01:48:14 -07:00
parent d40031b46f
commit 4dc985a1fa
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,7 +372,7 @@ class CompositeRingBuilder(object):
ring_data = crb.compose() ring_data = crb.compose()
# save the composite ring file # save the composite ring file
ring_data.save("composite_ring.gz"") ring_data.save("composite_ring.gz")
# save the composite metadata file # save the composite metadata file
crb.save("composite_builder.composite") crb.save("composite_builder.composite")

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

@@ -2119,7 +2119,8 @@ class TestRingBuilder(unittest.TestCase):
cm.exception.message) cm.exception.message)
# save must succeed for id to be assigned # save must succeed for id to be assigned
with self.assertRaises(IOError): with self.assertRaises(IOError):
rb.save(self.testdir + '/non-existent-dir/foo.builder') rb.save(os.path.join(
self.testdir, 'non-existent-dir', 'foo.builder'))
with self.assertRaises(AttributeError) as cm: with self.assertRaises(AttributeError) as cm:
rb.id rb.id
self.assertIn('id attribute has not been initialised', self.assertIn('id attribute has not been initialised',

9
test/unit/common/ring/test_composite_builder.py
View File

@@ -325,7 +325,7 @@ class TestCompositeBuilder(BaseTestCompositeBuilder):
# (default, part power is 6 with create_sample_ringbuilders) # (default, part power is 6 with create_sample_ringbuilders)
builders = self.create_sample_ringbuilders(1) builders = self.create_sample_ringbuilders(1)
# prepare another ring which has different part power # prepare another ring which has different replica count
builder = RingBuilder(6, 1, 1) builder = RingBuilder(6, 1, 1)
_, fname = tempfile.mkstemp(dir=self.tmpdir) _, fname = tempfile.mkstemp(dir=self.tmpdir)
for _ in range(4): for _ in range(4):
@@ -383,9 +383,7 @@ class TestCompositeRingBuilder(BaseTestCompositeBuilder):
def test_compose_with_builder_files(self): def test_compose_with_builder_files(self):
cb_file = os.path.join(self.tmpdir, 'test-composite-ring.json') cb_file = os.path.join(self.tmpdir, 'test-composite-ring.json')
builders = self.create_sample_ringbuilders(2) builders = self.create_sample_ringbuilders(2)
cb = CompositeRingBuilder(self.save_builders(builders)) cb, _ = self._make_composite_builder(builders)
cb.compose().save(self.output_ring)
self.check_composite_ring(self.output_ring, builders)
cb.save(cb_file) cb.save(cb_file)
for i, b in enumerate(builders): for i, b in enumerate(builders):
@@ -424,6 +422,7 @@ class TestCompositeRingBuilder(BaseTestCompositeBuilder):
# ...unless we force it # ...unless we force it
cb.compose(force=True).save(self.output_ring) cb.compose(force=True).save(self.output_ring)
self.check_composite_ring(self.output_ring, builders) self.check_composite_ring(self.output_ring, builders)
self.assertEqual(2, cb.version)
# check composite builder persists ok again # check composite builder persists ok again
cb_file = os.path.join(self.tmpdir, 'test-composite-ring.json2') cb_file = os.path.join(self.tmpdir, 'test-composite-ring.json2')
cb.save(cb_file) cb.save(cb_file)
@@ -661,7 +660,7 @@ class TestCompositeRingBuilder(BaseTestCompositeBuilder):
self.assertIn("Attribute mismatch for id", line) self.assertIn("Attribute mismatch for id", line)
self.assertEqual(1, cb.version) self.assertEqual(1, cb.version)
def test_compose_different_replica_count(self): def test_compose_replica_count_changed(self):
# not ok to change the number of replicas in a ring # not ok to change the number of replicas in a ring
builders = self.create_sample_ringbuilders(3) builders = self.create_sample_ringbuilders(3)
cb, builder_files = self._make_composite_builder(builders) cb, builder_files = self._make_composite_builder(builders)