From 5817f804fddaa1fd7642d774c0435148fb2067b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Antal?= <antal@inf.u-szeged.hu>
Date: Thu, 2 Feb 2017 15:19:13 +0100
Subject: [PATCH] Handle log message interpolation by the logger

According to OpenStack Guideline[1], logged string message should be
interpolated by the logger.

[1]: http://docs.openstack.org/developer/oslo.i18n/guidelines.html#adding-variables-to-log-messages

Change-Id: I49952348c06e340c6cfc708028f2b06e02a16dfc
Closes-Bug: #1661262
---
 swift/common/ring/builder.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

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