openstack/swift
Code Issues Proposed changes

Merge "Give spawn a cycle"

Browse Source
This commit is contained in:
Jenkins
2017-02-23 01:43:41 +00:00
committed by Gerrit Code Review
parent 413fb2b84f 5cd3095709
commit bf4467ebdd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift/obj/reconstructor.py
View File

@@ -564,7 +564,6 @@ class ObjectReconstructor(Daemon):
self.logger.exception( self.logger.exception(
'Unable to purge DiskFile (%r %r %r)', 'Unable to purge DiskFile (%r %r %r)',
object_hash, timestamps['ts_data'], frag_index) object_hash, timestamps['ts_data'], frag_index)
continue
def process_job(self, job): def process_job(self, job):
""" """
@@ -923,11 +922,11 @@ class ObjectReconstructor(Daemon):
stats = spawn(self.heartbeat) stats = spawn(self.heartbeat)
lockup_detector = spawn(self.detect_lockups) lockup_detector = spawn(self.detect_lockups)
sleep() # Give spawns a cycle
try: try:
self.run_pool = GreenPool(size=self.concurrency) self.run_pool = GreenPool(size=self.concurrency)
for part_info in self.collect_parts(**kwargs): for part_info in self.collect_parts(**kwargs):
sleep() # Give spawns a cycle
if not self.check_ring(part_info['policy'].object_ring): if not self.check_ring(part_info['policy'].object_ring):
self.logger.info(_("Ring change detected. Aborting " self.logger.info(_("Ring change detected. Aborting "
"current reconstruction pass.")) "current reconstruction pass."))