From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Aug 2014 20:39:51 +0000 (-0700)
Subject: mon/OSDMonitor: clean up 'osd perf' command placement
X-Git-Tag: v0.85~27^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b8a9ec20ac2877c8148e385e5551934392f1b3d;p=ceph.git

mon/OSDMonitor: clean up 'osd perf' command placement

This doesn't need an OSDMap; move it out of that block.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0f6204a4e59..6047cb15c43 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2189,12 +2189,23 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
     else
       rdata.append(ds);
   }
+  else if (prefix == "osd perf") {
+    const PGMap &pgm = mon->pgmon()->pg_map;
+    if (f) {
+      f->open_object_section("osdstats");
+      pgm.dump_osd_perf_stats(f.get());
+      f->close_section();
+      f->flush(ds);
+    } else {
+      pgm.print_osd_perf_stats(&ds);
+    }
+    rdata.append(ds);
+  }
   else if (prefix == "osd dump" ||
 	   prefix == "osd tree" ||
 	   prefix == "osd ls" ||
 	   prefix == "osd getmap" ||
-	   prefix == "osd getcrushmap" ||
-	   prefix == "osd perf") {
+	   prefix == "osd getcrushmap") {
     string val;
 
     epoch_t epoch = 0;
@@ -2267,17 +2278,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
     } else if (prefix == "osd getcrushmap") {
       p->crush->encode(rdata);
       ss << "got crush map from osdmap epoch " << p->get_epoch();
-    } else if (prefix == "osd perf") {
-      const PGMap &pgm = mon->pgmon()->pg_map;
-      if (f) {
-	f->open_object_section("osdstats");
-	pgm.dump_osd_perf_stats(f.get());
-	f->close_section();
-	f->flush(ds);
-      } else {
-	pgm.print_osd_perf_stats(&ds);
-      }
-      rdata.append(ds);
     }
     if (p != &osdmap)
       delete p;