From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 28 Jan 2016 10:26:39 +0000 (+0100)
Subject: mon/PGMonitor.cc: return error instead of '0' from dump_stuck_pg_stats()
X-Git-Tag: v10.0.4~86^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21ac97817c8bbf826dd6159d66de81379061b4ef;p=ceph.git

mon/PGMonitor.cc: return error instead of '0' from dump_stuck_pg_stats()

Fix for:

[src/mon/PGMonitor.cc:1667] -> [src/mon/PGMonitor.cc:1669]: (performance)
 Variable 'r' is reassigned a value before the old one has been used.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 98ffb8b58038..60ce45d49412 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1748,7 +1748,10 @@ bool PGMonitor::preprocess_command(MonOpRequestRef op)
                int64_t(g_conf->mon_pg_stuck_threshold));
 
     r = dump_stuck_pg_stats(ds, f.get(), (int)threshold, stuckop_vec);
-    ss << "ok";
+    if (r < 0)
+      ss << "failed";  
+    else 
+      ss << "ok";
     r = 0;
   } else if (prefix == "pg map") {
     pg_t pgid;
@@ -2437,7 +2440,7 @@ int PGMonitor::dump_stuck_pg_stats(stringstream &ds,
       stuck_types |= PGMap::STUCK_STALE;
     else {
       ds << "Unknown type: " << *i << std::endl;
-      return 0;
+      return -EINVAL;
     }
   }