openstack/swift
Code Issues Proposed changes

Device marked to be removed in info about the ring.

Browse Source 
Showing devices with 'DEL' mark if will be removed next rebalance.

Change-Id: I171aa8658b1c4ac1689ab9532fe65d114567baa7
This commit is contained in:
Peter Lisák 2015-10-23 12:40:15 +02:00
parent 8f78c1a2b0
commit febdd6c1b4
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/cli/ringbuilder.py
View File

@ -421,6 +421,8 @@ swift-ring-builder <builder_file> create <part_power> <replicas>
"""
swift-ring-builder <builder_file>
Shows information about the ring and the devices within.
Flags:
DEL - marked for removal and will be removed next rebalance.
"""
print('%s, build version %d' % (builder_file, builder.version))
regions = 0
@ -448,7 +450,7 @@ swift-ring-builder <builder_file>
if builder.devs:
print('Devices: id region zone ip address port '
'replication ip replication port name '
'weight partitions balance meta')
'weight partitions balance flags meta')
weighted_parts = builder.parts * builder.replicas / \
sum(d['weight'] for d in builder.devs if d is not None)
for dev in builder.devs:
@ -462,12 +464,13 @@ swift-ring-builder <builder_file>
else:
balance = 100.0 * dev['parts'] / \
(dev['weight'] * weighted_parts) - 100.0
flags = 'DEL' if dev in builder._remove_devs else ''
print(' %5d %7d %5d %15s %5d %15s %17d %9s %6.02f '
'%10s %7.02f %s' %
'%10s %7.02f %5s %s' %
(dev['id'], dev['region'], dev['zone'], dev['ip'],
dev['port'], dev['replication_ip'],
dev['replication_port'], dev['device'], dev['weight'],
dev['parts'], balance, dev['meta']))
dev['parts'], balance, flags, dev['meta']))
exit(EXIT_SUCCESS)
def search():

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

@ -1663,6 +1663,49 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
argv = ["", self.tmpfile]
self.assertRaises(SystemExit, ringbuilder.main, argv)
def test_default_show_removed(self):
mock_stdout = six.StringIO()
mock_stderr = six.StringIO()
self.create_sample_ring()
# Note: it also sets device's weight to zero.
argv = ["", self.tmpfile, "remove", "--id", "1"]
self.assertRaises(SystemExit, ringbuilder.main, argv)
# Setting another device's weight to zero to be sure we distinguish
# real removed device and device with zero weight.
argv = ["", self.tmpfile, "set_weight", "0", "--id", "3"]
self.assertRaises(SystemExit, ringbuilder.main, argv)
argv = ["", self.tmpfile]
with mock.patch("sys.stdout", mock_stdout):
with mock.patch("sys.stderr", mock_stderr):
self.assertRaises(SystemExit, ringbuilder.main, argv)
expected = "%s, build version 6\n" \
"64 partitions, 3.000000 replicas, 4 regions, 4 zones, " \
"4 devices, 100.00 balance, 0.00 dispersion\n" \
"The minimum number of hours before a partition can be " \
"reassigned is 1\n" \
"The overload factor is 0.00%% (0.000000)\n" \
"Devices: id region zone ip address port " \
"replication ip replication port name weight " \
"partitions balance flags meta\n" \
" 0 0 0 127.0.0.1 6000 " \
"127.0.0.1 6000 sda1 100.00" \
" 0 -100.00 some meta data\n" \
" 1 1 1 127.0.0.2 6001 " \
"127.0.0.2 6001 sda2 0.00" \
" 0 0.00 DEL \n" \
" 2 2 2 127.0.0.3 6002 " \
"127.0.0.3 6002 sdc3 100.00" \
" 0 -100.00 \n" \
" 3 3 3 127.0.0.4 6003 " \
"127.0.0.4 6003 sdd4 0.00" \
" 0 0.00 \n" % self.tmpfile
self.assertEqual(expected, mock_stdout.getvalue())
def test_rebalance(self):
self.create_sample_ring()
argv = ["", self.tmpfile, "rebalance", "3"]