Created
August 18, 2016 07:31
-
-
Save bloodeagle40234/3d05f8cd4c217fc62581163e3a8e3078 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py | |
index 3a243d6..4a8956a 100644 | |
--- a/swift/obj/auditor.py | |
+++ b/swift/obj/auditor.py | |
@@ -45,7 +45,6 @@ class AuditorWorker(object): | |
self.conf = conf | |
self.logger = logger | |
self.devices = devices | |
- self.diskfile_router = diskfile.DiskFileRouter(conf, self.logger) | |
self.max_files_per_second = float(conf.get('files_per_second', 20)) | |
self.max_bytes_per_second = float(conf.get('bytes_per_second', | |
10000000)) | |
@@ -74,6 +73,8 @@ class AuditorWorker(object): | |
self.conf.get('rsync_tempfile_timeout'), default) | |
self.reclaim_age = config_auto_int_value( | |
self.conf.get('reclaim_age'), default_reclaim_age) | |
+ conf.update({'reclaim_age': self.reclaim_age}) | |
+ self.diskfile_router = diskfile.DiskFileRouter(conf, self.logger) | |
self.auditor_type = 'ALL' | |
self.zero_byte_only_at_fps = zero_byte_only_at_fps | |
@@ -277,7 +278,7 @@ class AuditorWorker(object): | |
suffix_dir = [basename(suffix_path)] | |
diskfile_mgr.get_hashes(device_dir, partition_dir, suffix_dir, | |
- location.policy, self.reclaim_age) | |
+ location.policy) | |
except DiskFileNotExist: | |
pass | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment