From 1c7e25133a2517d3ba9e34b4540886ba1a953370 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Oct 2009 11:58:03 -0700
Subject: [PATCH] mon: allow {getmap,getcurhsmap} <epoch>

---
 src/mon/OSDMonitor.cc | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c725c6ca0af47..655a629231dc4 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -941,7 +941,9 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
       osdmap.print_summary(ss);
       r = 0;
     }
-    else if (m->cmd[1] == "dump") {
+    else if (m->cmd[1] == "dump" ||
+	     m->cmd[1] == "getmap" ||
+	     m->cmd[1] == "getcrushmap") {
       OSDMap *p = &osdmap;
       if (m->cmd.size() > 2) {
 	epoch_t e = atoi(m->cmd[2].c_str());
@@ -956,25 +958,23 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
 	}
       }
       if (p) {
-	stringstream ds;
-	p->print(ds);
-	rdata.append(ds);
-	ss << "dumped osdmap epoch " << p->get_epoch();
+	if (m->cmd[1] == "dump") {
+	  stringstream ds;
+	  p->print(ds);
+	  rdata.append(ds);
+	  ss << "dumped osdmap epoch " << p->get_epoch();
+	} else if (m->cmd[1] == "getmap") {
+	  p->encode(rdata);
+	  ss << "got osdmap epoch " << p->get_epoch();
+	} else if (m->cmd[1] == "getcrushmap") {
+	  p->crush.encode(rdata);
+	  ss << "got crush map from osdmap epoch " << p->get_epoch();
+	}
 	if (p != &osdmap)
 	  delete p;
 	r = 0;
       }
     }
-    else if (m->cmd[1] == "getmap") {
-      osdmap.encode(rdata);
-      ss << "got osdmap epoch " << osdmap.get_epoch();
-      r = 0;
-    }
-    else if (m->cmd[1] == "getcrushmap") {
-      osdmap.crush.encode(rdata);
-      ss << "got crush map from osdmap epoch " << osdmap.get_epoch();
-      r = 0;
-    }
     else if (m->cmd[1] == "getmaxosd") {
       ss << "max_osd = " << osdmap.get_max_osd() << " in epoch " << osdmap.get_epoch();
       r = 0;
-- 
2.39.5