From de38b727b475876b4a3e4dcf7dca21de8454722e Mon Sep 17 00:00:00 2001 From: Samuel Merritt Date: Thu, 8 Mar 2018 13:02:46 -0800 Subject: [PATCH] Don't double-filter replication jobs ObjectReplicator.collect_jobs() takes and correctly applies the various overrides, so there's no need to check the returned jobs against the overrides. Change-Id: I2a59b26410d1732a5f2c8f1f32e397d77550860e --- swift/obj/replicator.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/swift/obj/replicator.py b/swift/obj/replicator.py index 6d733e9c69..f60ad502fd 100644 --- a/swift/obj/replicator.py +++ b/swift/obj/replicator.py @@ -745,11 +745,6 @@ def replicate(self, override_devices=None, override_partitions=None, override_policies=override_policies) for job in jobs: current_nodes = job['nodes'] - if override_devices and job['device'] not in override_devices: - continue - if override_partitions and \ - job['partition'] not in override_partitions: - continue dev_path = check_drive(self.devices_dir, job['device'], self.mount_check) if not dev_path: