openstack/swift
Code Issues Proposed changes

Merge "Handle log message interpolation by the logger"

Browse Source
This commit is contained in:
Jenkins 2017-02-02 19:54:29 +00:00 committed by Gerrit Code Review
commit 4125e8c1df
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swift/common/ring/builder.py
View File

@ -492,8 +492,8 @@ class RingBuilder(object):
break break
else: else:
finish_status = 'Unable to finish' finish_status = 'Unable to finish'
self.logger.debug('%s rebalance plan after %s attempts' % ( self.logger.debug('%(status)s rebalance plan after %(count)s attempts',
finish_status, gather_count + 1)) {'status': finish_status, 'count': gather_count + 1})
self.devs_changed = False self.devs_changed = False
self.version += 1 self.version += 1
@ -743,10 +743,12 @@ class RingBuilder(object):
'Device %s has zero weight and ' 'Device %s has zero weight and '
'should not want any replicas' % (tier,)) 'should not want any replicas' % (tier,))
required = (wanted[tier] - weighted[tier]) / weighted[tier] required = (wanted[tier] - weighted[tier]) / weighted[tier]
self.logger.debug('%s wants %s and is weighted for %s so ' self.logger.debug('%(tier)s wants %(wanted)s and is weighted for '
'therefore requires %s overload' % ( '%(weight)s so therefore requires %(required)s '
tier, wanted[tier], weighted[tier], 'overload', {'tier': tier,
required)) 'wanted': wanted[tier],
'weight': weighted[tier],
'required': required})
if required > max_overload: if required > max_overload:
max_overload = required max_overload = required
return max_overload return max_overload
@ -1096,9 +1098,10 @@ class RingBuilder(object):
random_half = random.randint(0, self.parts / 2) random_half = random.randint(0, self.parts / 2)
start = (self._last_part_gather_start + quarter_turn + start = (self._last_part_gather_start + quarter_turn +
random_half) % self.parts random_half) % self.parts
self.logger.debug('Gather start is %s ' self.logger.debug('Gather start is %(start)s '
'(Last start was %s)' % ( '(Last start was %(last_start)s)',
start, self._last_part_gather_start)) {'start': start,
'last_start': self._last_part_gather_start})
self._last_part_gather_start = start self._last_part_gather_start = start
self._gather_parts_for_balance_can_disperse( self._gather_parts_for_balance_can_disperse(