From 21ac97817c8bbf826dd6159d66de81379061b4ef Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Thu, 28 Jan 2016 11:26:39 +0100 Subject: [PATCH] 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 --- src/mon/PGMonitor.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 98ffb8b580384..60ce45d494126 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; } } -- 2.39.5