openstack/swift
Code Issues Proposed changes

Merge "Change partition name from string to integer"

Browse Source
This commit is contained in:
Zuul 2019-04-09 21:20:50 +00:00 committed by Gerrit Code Review
commit 48a2e5c311
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/obj/replicator.py
View File

@ -817,8 +817,8 @@ class ObjectReplicator(Daemon):
self.logger.exception('ERROR creating %s' % obj_path) self.logger.exception('ERROR creating %s' % obj_path)
continue continue
for partition in os.listdir(obj_path): for partition in os.listdir(obj_path):
if (override_partitions is not None if (override_partitions is not None and partition.isdigit()
and partition not in override_partitions): and int(partition) not in override_partitions):
continue continue
if (partition.startswith('auditor_status_') and if (partition.startswith('auditor_status_') and

4
test/unit/obj/test_replicator.py
View File

@ -1401,10 +1401,10 @@ class TestObjectReplicator(unittest.TestCase):
self.assertTrue(os.access(part_path, os.F_OK)) self.assertTrue(os.access(part_path, os.F_OK))
self.replicator.replicate(override_devices=['sdb']) self.replicator.replicate(override_devices=['sdb'])
self.assertTrue(os.access(part_path, os.F_OK)) self.assertTrue(os.access(part_path, os.F_OK))
self.replicator.replicate(override_partitions=['9']) self.replicator.replicate(override_partitions=[9])
self.assertTrue(os.access(part_path, os.F_OK)) self.assertTrue(os.access(part_path, os.F_OK))
self.replicator.replicate(override_devices=['sda'], self.replicator.replicate(override_devices=['sda'],
override_partitions=['1']) override_partitions=[1])
self.assertFalse(os.access(part_path, os.F_OK)) self.assertFalse(os.access(part_path, os.F_OK))
def test_delete_policy_override_params(self): def test_delete_policy_override_params(self):