From: David Zafman <dzafman@redhat.com>
Date: Wed, 20 Nov 2019 22:08:24 +0000 (-0800)
Subject: mgr: Fix balancer print
X-Git-Tag: v14.2.8~20^2~18^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22c0df4a921c024d9c913f94ef08dba599c62659;p=ceph.git

mgr: Fix balancer print

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0af7e25620ae823d46eb842992570ddc1607cc4f)
---

diff --git a/qa/standalone/mgr/balancer.sh b/qa/standalone/mgr/balancer.sh
index 979d70e3c2c3..425d4de2d6da 100755
--- a/qa/standalone/mgr/balancer.sh
+++ b/qa/standalone/mgr/balancer.sh
@@ -104,7 +104,7 @@ function TEST_balancer() {
     ! ceph balancer optimize plan_upmap $TEST_POOL || return 1
     ceph balancer status || return 1
     eval RESULT=$(ceph balancer status | jq '.optimize_result')
-    test "$RESULT" = "Unable to find further optimization, or pool(s)' pg_num is decreasing, or distribution is already perfect" || return 1
+    test "$RESULT" = "Unable to find further optimization, or pool(s) pg_num is decreasing, or distribution is already perfect" || return 1
 
     ceph balancer on || return 1
     ACTIVE=$(ceph balancer status | jq '.active')
diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py
index fe30cd66ef14..ee76e9ee755a 100644
--- a/src/pybind/mgr/balancer/module.py
+++ b/src/pybind/mgr/balancer/module.py
@@ -980,7 +980,7 @@ class Module(MgrModule):
         self.log.info('prepared %d/%d changes' % (total_did, max_iterations))
         if total_did == 0:
             return -errno.EALREADY, 'Unable to find further optimization, ' \
-                                    'or pool(s)\' pg_num is decreasing, ' \
+                                    'or pool(s) pg_num is decreasing, ' \
                                     'or distribution is already perfect'
         return 0, ''