openstack/swift
Code Issues Proposed changes

Merge "Improve 'swift-manage-shard-ranges compact' output"

Browse Source
This commit is contained in:
Zuul 2021-02-22 23:35:39 +00:00 committed by Gerrit Code Review
commit 2aaeab6f5d
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swift/cli/manage_shard_ranges.py
View File

@ -177,6 +177,12 @@ DEFAULT_MAX_SHRINKING = 1
DEFAULT_MAX_EXPANDING = -1
def _print_shard_range(sr, level=0):
indent = ' ' * level
print(indent + 'objects: %-9d lower: %r' % (sr.object_count, sr.lower_str))
print(indent + ' state: %-9s upper: %r' % (sr.state_text, sr.upper_str))
def _load_and_validate_shard_data(args):
try:
with open(args.input, 'r') as fd:
@ -454,12 +460,12 @@ def compact_shard_ranges(broker, args):
for sequence in compactible:
acceptor = sequence[-1]
donors = sequence[:-1]
print('Shard %s (object count %d) can expand to accept %d objects '
'from:' %
(acceptor, acceptor.object_count, donors.object_count))
print('Donor shard range(s) with total of %d objects:'
% donors.object_count)
for donor in donors:
print(' shard %s (object count %d)' %
(donor, donor.object_count))
_print_shard_range(donor, level=1)
print('can be compacted into acceptor shard range:')
_print_shard_range(acceptor, level=1)
print('Once applied to the broker these changes will result in shard '
'range compaction the next time the sharder runs.')
choice = input('Do you want to apply these changes? [y/N]')

13
test/unit/cli/test_manage_shard_ranges.py
View File

@ -529,11 +529,14 @@ class TestManageShardRanges(unittest.TestCase):
err_lines = err.getvalue().split('\n')
self.assert_starts_with(err_lines[0], 'Loaded db broker for ')
out_lines = out.getvalue().split('\n')
self.assertIn('can expand to accept 20 objects', out_lines[0])
self.assertIn('(object count 10)', out_lines[1])
self.assertIn('(object count 10)', out_lines[2])
self.assertIn('can expand to accept 10 objects', out_lines[3])
self.assertIn('(object count 10)', out_lines[4])
self.assertIn('total of 20 objects', out_lines[0])
self.assertIn('objects: 10', out_lines[1])
self.assertIn('state: active', out_lines[2])
self.assertIn('objects: 10', out_lines[3])
self.assertIn('state: active', out_lines[4])
self.assertIn('can be compacted into', out_lines[5])
self.assertIn('objects: 10', out_lines[6])
self.assertIn('state: active', out_lines[7])
broker_ranges = broker.get_shard_ranges()
return broker_ranges