From: John Spray <john.spray@redhat.com>
Date: Thu, 9 Mar 2017 13:15:46 +0000 (+0000)
Subject: mon: fix hiding mdsmonitor informative strings
X-Git-Tag: v11.2.1~134^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93efc1e9484ea41f3eb831dcb3d19d63b044ef70;p=ceph.git

mon: fix hiding mdsmonitor informative strings

Local `stringstream ss` declarations were hiding
the real variable used to feed back to the user.

Fixes: http://tracker.ceph.com/issues/16709
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 00404ae9bd4cce0518a44d36d2d6a5612f4f9d04)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 9015405ee2a..01243a0e3ee 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -2272,7 +2272,6 @@ int MDSMonitor::filesystem_command(
       pending_fsmap.modify_daemon(gid, [state](MDSMap::mds_info_t *info) {
         info->state = state;
       });
-      stringstream ss;
       ss << "set mds gid " << gid << " to state " << state << " "
          << ceph_mds_state_name(state);
       return 0;
@@ -2303,7 +2302,6 @@ int MDSMonitor::filesystem_command(
         return -EBUSY;
       } else {
         pending_fsmap.erase(gid, {});
-        stringstream ss;
         ss << "removed mds gid " << gid;
         return 0;
       }
@@ -2333,7 +2331,6 @@ int MDSMonitor::filesystem_command(
       fs->mds_map.failed.erase(role.rank);
     });
 
-    stringstream ss;
     ss << "removed failed mds." << role;
     return 0;
   } else if (prefix == "mds compat rm_compat") {