openstack/swift
Code Issues Proposed changes

Merge "relinker: Add policy to relinker progress output"

Browse Source
This commit is contained in:
Zuul 2021-03-25 02:09:07 +00:00 committed by Gerrit Code Review
commit 8cc1ef9255
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift/cli/relinker.py
View File

@ -244,9 +244,10 @@ class Relinker(object):
num_parts_done = sum( num_parts_done = sum(
1 for part in self.states["state"].values() 1 for part in self.states["state"].values()
if part) if part)
self.logger.info("Device: %s Step: %s Partitions: %d/%d" % ( step = STEP_CLEANUP if self.do_cleanup else STEP_RELINK
device, STEP_CLEANUP if self.do_cleanup else STEP_RELINK, num_total_parts = len(self.states["state"])
num_parts_done, len(self.states["state"]))) self.logger.info("Step: %s Device: %s Policy: %s Partitions: %d/%d" % (
step, device, self.policy.name, num_parts_done, num_total_parts))
def hashes_filter(self, suff_path, hashes): def hashes_filter(self, suff_path, hashes):
hashes = list(hashes) hashes = list(hashes)

20
test/unit/cli/test_relinker.py
View File

@ -954,7 +954,7 @@ class TestRelinker(unittest.TestCase):
self.assertEqual( self.assertEqual(
['Processing files for policy platinum under %s (cleanup=False)' ['Processing files for policy platinum under %s (cleanup=False)'
% self.devices, % self.devices,
'Device: sda1 Step: relink Partitions: 1/3', 'Step: relink Device: sda1 Policy: platinum Partitions: 1/3',
'1 hash dirs processed (cleanup=False) (1 files, 1 linked, ' '1 hash dirs processed (cleanup=False) (1 files, 1 linked, '
'0 removed, 0 errors)'], '0 removed, 0 errors)'],
self.logger.get_lines_for_level('info') self.logger.get_lines_for_level('info')
@ -988,8 +988,8 @@ class TestRelinker(unittest.TestCase):
self.assertEqual( self.assertEqual(
['Processing files for policy platinum under %s (cleanup=False)' ['Processing files for policy platinum under %s (cleanup=False)'
% self.devices, % self.devices,
'Device: sda1 Step: relink Partitions: 2/3', 'Step: relink Device: sda1 Policy: platinum Partitions: 2/3',
'Device: sda1 Step: relink Partitions: 3/3', 'Step: relink Device: sda1 Policy: platinum Partitions: 3/3',
'2 hash dirs processed (cleanup=False) (2 files, 2 linked, ' '2 hash dirs processed (cleanup=False) (2 files, 2 linked, '
'0 removed, 0 errors)'], '0 removed, 0 errors)'],
self.logger.get_lines_for_level('info') self.logger.get_lines_for_level('info')
@ -1069,7 +1069,7 @@ class TestRelinker(unittest.TestCase):
self.assertEqual( self.assertEqual(
['Processing files for policy gold under %s/%s (cleanup=False)' ['Processing files for policy gold under %s/%s (cleanup=False)'
% (self.devices, self.existing_device), % (self.devices, self.existing_device),
'Device: sda1 Step: relink Partitions: 1/1', 'Step: relink Device: sda1 Policy: gold Partitions: 1/1',
'1 hash dirs processed (cleanup=False) (1 files, 1 linked, ' '1 hash dirs processed (cleanup=False) (1 files, 1 linked, '
'0 removed, 0 errors)'], '0 removed, 0 errors)'],
self.logger.get_lines_for_level('info')) self.logger.get_lines_for_level('info'))
@ -1821,7 +1821,8 @@ class TestRelinker(unittest.TestCase):
# Ack partition 96 # Ack partition 96
r.hook_post_partition(os.path.join(datadir_path, '96')) r.hook_post_partition(os.path.join(datadir_path, '96'))
self.assertEqual(r.states["state"], {'96': True, '227': False}) self.assertEqual(r.states["state"], {'96': True, '227': False})
self.assertIn("Device: sda1 Step: relink Partitions: 1/2", self.assertIn("Step: relink Device: sda1 Policy: %s "
"Partitions: 1/2" % r.policy.name,
self.logger.get_lines_for_level("info")) self.logger.get_lines_for_level("info"))
with open(state_file, 'rt') as f: with open(state_file, 'rt') as f:
self.assertEqual(json.load(f), { self.assertEqual(json.load(f), {
@ -1836,7 +1837,8 @@ class TestRelinker(unittest.TestCase):
# Ack partition 227 # Ack partition 227
r.hook_post_partition(os.path.join(datadir_path, '227')) r.hook_post_partition(os.path.join(datadir_path, '227'))
self.assertIn("Device: sda1 Step: relink Partitions: 2/2", self.assertIn("Step: relink Device: sda1 Policy: %s "
"Partitions: 2/2" % r.policy.name,
self.logger.get_lines_for_level("info")) self.logger.get_lines_for_level("info"))
self.assertEqual(r.states["state"], {'96': True, '227': True}) self.assertEqual(r.states["state"], {'96': True, '227': True})
with open(state_file, 'rt') as f: with open(state_file, 'rt') as f:
@ -1879,7 +1881,8 @@ class TestRelinker(unittest.TestCase):
r.partitions_filter("", ['96', '227', '312'])) r.partitions_filter("", ['96', '227', '312']))
# Ack partition 227 # Ack partition 227
r.hook_post_partition(os.path.join(datadir_path, '227')) r.hook_post_partition(os.path.join(datadir_path, '227'))
self.assertIn("Device: sda1 Step: cleanup Partitions: 1/2", self.assertIn("Step: cleanup Device: sda1 Policy: %s "
"Partitions: 1/2" % r.policy.name,
self.logger.get_lines_for_level("info")) self.logger.get_lines_for_level("info"))
self.assertEqual(r.states["state"], self.assertEqual(r.states["state"],
{'96': False, '227': True}) {'96': False, '227': True})
@ -1897,7 +1900,8 @@ class TestRelinker(unittest.TestCase):
# Ack partition 96 # Ack partition 96
r.hook_post_partition(os.path.join(datadir_path, '96')) r.hook_post_partition(os.path.join(datadir_path, '96'))
self.assertIn("Device: sda1 Step: cleanup Partitions: 2/2", self.assertIn("Step: cleanup Device: sda1 Policy: %s "
"Partitions: 2/2" % r.policy.name,
self.logger.get_lines_for_level("info")) self.logger.get_lines_for_level("info"))
self.assertEqual(r.states["state"], self.assertEqual(r.states["state"],
{'96': True, '227': True}) {'96': True, '227': True})