openstack/swift
Code Issues Proposed changes

Merge "Ringbuilder: Forbid writing empty rings"

Browse Source
This commit is contained in:
Zuul 2017-12-13 05:00:19 +00:00 committed by Gerrit Code Review
commit 0e95730eb3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/cli/ringbuilder.py
View File

@ -1085,14 +1085,16 @@ swift-ring-builder <builder_file> write_ring
'set_info' calls when no rebalance is needed but you want to send out the 'set_info' calls when no rebalance is needed but you want to send out the
new device information. new device information.
""" """
if not builder.devs:
print('Unable to write empty ring.')
exit(EXIT_ERROR)
ring_data = builder.get_ring() ring_data = builder.get_ring()
if not ring_data._replica2part2dev_id: if not ring_data._replica2part2dev_id:
if ring_data.devs: if ring_data.devs:
print('Warning: Writing a ring with no partition ' print('Warning: Writing a ring with no partition '
'assignments but with devices; did you forget to run ' 'assignments but with devices; did you forget to run '
'"rebalance"?') '"rebalance"?')
else:
print('Warning: Writing an empty ring')
ring_data.save( ring_data.save(
pathjoin(backup_dir, '%d.' % time() + basename(ring_file))) pathjoin(backup_dir, '%d.' % time() + basename(ring_file)))
ring_data.save(ring_file) ring_data.save(ring_file)

8
test/unit/cli/test_ringbuilder.py
View File

@ -46,7 +46,6 @@ class RunSwiftRingBuilderMixin(object):
if 'exp_results' in kwargs: if 'exp_results' in kwargs:
exp_results = kwargs['exp_results'] exp_results = kwargs['exp_results']
argv = argv[:-1]
else: else:
exp_results = None exp_results = None
@ -2078,6 +2077,13 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
argv = ["", self.tmpfile, "write_ring"] argv = ["", self.tmpfile, "write_ring"]
self.assertSystemExit(EXIT_SUCCESS, ringbuilder.main, argv) self.assertSystemExit(EXIT_SUCCESS, ringbuilder.main, argv)
def test_write_empty_ring(self):
ring = RingBuilder(6, 3, 1)
ring.save(self.tmpfile)
exp_results = {'valid_exit_codes': [2]}
out, err = self.run_srb("write_ring", exp_results=exp_results)
self.assertEqual('Unable to write empty ring.\n', out)
def test_write_builder(self): def test_write_builder(self):
# Test builder file already exists # Test builder file already exists
self.create_sample_ring() self.create_sample_ring()