openstack/swift
Code Issues Proposed changes

Merge "relinker: trivial comment and test fixes"

Browse Source
This commit is contained in:
Zuul 2021-04-06 23:45:09 +00:00 committed by Gerrit Code Review
commit 4780f812bc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/cli/relinker.py
View File

@ -269,7 +269,7 @@ class Relinker(object):
start = self.next_part_power - 1 start = self.next_part_power - 1
stop = max(start - self.conf['link_check_limit'], -1) stop = max(start - self.conf['link_check_limit'], -1)
for check_part_power in range(start, stop, -1): for check_part_power in range(start, stop, -1):
# Try to create the link from each of 3 previous part power # Try to create the link from each of several previous part power
# locations. If an attempt succeeds then either a link was made or # locations. If an attempt succeeds then either a link was made or
# an existing link with the same inode as the next part power # an existing link with the same inode as the next part power
# location was found: either is acceptable. The part power location # location was found: either is acceptable. The part power location

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

@ -1397,7 +1397,6 @@ class TestRelinker(unittest.TestCase):
self.assertIn('2 hash dirs processed (cleanup=False) ' self.assertIn('2 hash dirs processed (cleanup=False) '
'(2 files, 0 linked, 1 removed, 0 errors)', '(2 files, 0 linked, 1 removed, 0 errors)',
info_lines) info_lines)
print(info_lines)
with open(new_filepath, 'r') as fd: with open(new_filepath, 'r') as fd:
self.assertEqual(old_filepath, fd.read()) self.assertEqual(old_filepath, fd.read())
self.assertFalse(os.path.exists(older_filepath)) self.assertFalse(os.path.exists(older_filepath))