openstack/swift
Code Issues Proposed changes

refactored run forever loop in auditors to remove an unneeded call

Browse Source
This commit is contained in:
John Dickinson
2010-10-12 15:03:26 -05:00
parent 458055a347
commit 226c074dd5
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/account/auditor.py
View File

@@ -80,9 +80,9 @@ class AccountAuditor(Daemon):
"""Run the account audit until stopped.""" """Run the account audit until stopped."""
reported = time.time() reported = time.time()
time.sleep(random() * self.interval) time.sleep(random() * self.interval)
all_brokers = self.broker_generator()
while True: while True:
begin = time.time() begin = time.time()
all_brokers = self.broker_generator()
for broker in all_brokers: for broker in all_brokers:
self.account_audit(broker) self.account_audit(broker)
if time.time() - reported >= 3600: # once an hour if time.time() - reported >= 3600: # once an hour
@@ -97,8 +97,6 @@ class AccountAuditor(Daemon):
elapsed = time.time() - begin elapsed = time.time() - begin
if elapsed < self.interval: if elapsed < self.interval:
time.sleep(self.interval - elapsed) time.sleep(self.interval - elapsed)
# reset all_brokers so we loop forever
all_brokers = self.broker_generator()
def run_once(self): def run_once(self):
"""Run the account audit once.""" """Run the account audit once."""

4
swift/container/auditor.py
View File

@@ -80,9 +80,9 @@ class ContainerAuditor(Daemon):
"""Run the container audit until stopped.""" """Run the container audit until stopped."""
reported = time.time() reported = time.time()
time.sleep(random() * self.interval) time.sleep(random() * self.interval)
all_brokers = self.broker_generator()
while True: while True:
begin = time.time() begin = time.time()
all_brokers = self.broker_generator()
for broker in all_brokers: for broker in all_brokers:
self.container_audit(broker) self.container_audit(broker)
if time.time() - reported >= 3600: # once an hour if time.time() - reported >= 3600: # once an hour
@@ -97,8 +97,6 @@ class ContainerAuditor(Daemon):
elapsed = time.time() - begin elapsed = time.time() - begin
if elapsed < self.interval: if elapsed < self.interval:
time.sleep(self.interval - elapsed) time.sleep(self.interval - elapsed)
# reset all_brokers so we loop forever
all_brokers = self.broker_generator()
def run_once(self): def run_once(self):
"""Run the container audit once.""" """Run the container audit once."""

27
swift/obj/auditor.py
View File

@@ -92,20 +92,21 @@ class ObjectAuditor(Daemon):
time.sleep(random() * self.interval) time.sleep(random() * self.interval)
while True: while True:
begin = time.time() begin = time.time()
for df in self.DiskFile_generator(): all_dfs = self.DiskFile_generator()
for df in all_dfs:
self.object_audit(df) self.object_audit(df)
if time.time() - reported >= 3600: # once an hour if time.time() - reported >= 3600: # once an hour
self.logger.info( self.logger.info(
'Since %s: Locally: %d passed audit, %d quarantined, %d ' 'Since %s: Locally: %d passed audit, %d quarantined, %d '
'errors' % (time.ctime(reported), self.passes, 'errors' % (time.ctime(reported), self.passes,
self.quarantines, self.errors)) self.quarantines, self.errors))
reported = time.time() reported = time.time()
self.passes = 0 self.passes = 0
self.quarantines = 0 self.quarantines = 0
self.errors = 0 self.errors = 0
elapsed = time.time() - begin elapsed = time.time() - begin
if elapsed < self.interval: if elapsed < self.interval:
time.sleep(self.interval - elapsed) time.sleep(self.interval - elapsed)
def run_once(self): def run_once(self):
"""Run the object audit once.""" """Run the object audit once."""