diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-13 09:20:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-13 09:20:08 +0000 |
| commit | d43d59e4c6818b186996583a672ec445e35f7693 (patch) | |
| tree | 37d33d090c52383f7585074259ba692ad731599d | |
| parent | 85022a4444b486d96e0a3db5636cd0770669e5c2 (diff) | |
| parent | a045f90b4d7ccc2da4cd52883c04c176b9ec920f (diff) | |
| download | swift-d43d59e4c6818b186996583a672ec445e35f7693.tar.gz | |
Merge "Add name to compact output"
| -rw-r--r-- | swift/cli/manage_shard_ranges.py | 6 | ||||
| -rw-r--r-- | test/unit/cli/test_manage_shard_ranges.py | 20 |
2 files changed, 15 insertions, 11 deletions
diff --git a/swift/cli/manage_shard_ranges.py b/swift/cli/manage_shard_ranges.py index 43efe57fa..6599c7daa 100644 --- a/swift/cli/manage_shard_ranges.py +++ b/swift/cli/manage_shard_ranges.py @@ -181,8 +181,10 @@ DEFAULT_SHRINK_THRESHOLD = DEFAULT_SHARD_CONTAINER_THRESHOLD * \ 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)) + print(indent + '%r' % sr.name) + 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): diff --git a/test/unit/cli/test_manage_shard_ranges.py b/test/unit/cli/test_manage_shard_ranges.py index 0937c4341..2f66f3260 100644 --- a/test/unit/cli/test_manage_shard_ranges.py +++ b/test/unit/cli/test_manage_shard_ranges.py @@ -694,15 +694,17 @@ class TestManageShardRanges(unittest.TestCase): self.assert_starts_with(err_lines[0], 'Loaded db broker for ') out_lines = out.getvalue().split('\n') 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 + self.assertIn('.shards_a', out_lines[1]) + self.assertIn('objects: 10', out_lines[2]) + self.assertIn('state: active', out_lines[3]) + self.assertIn('.shards_a', out_lines[4]) + self.assertIn('objects: 10', out_lines[5]) + self.assertIn('state: active', out_lines[6]) + self.assertIn('can be compacted into', out_lines[7]) + self.assertIn('.shards_a', out_lines[8]) + self.assertIn('objects: 10', out_lines[9]) + self.assertIn('state: active', out_lines[10]) + return broker.get_shard_ranges() broker_ranges = do_compact('n') # expect no changes to shard ranges |