From: Sage Weil <sage@redhat.com>
Date: Wed, 7 Jun 2017 03:33:45 +0000 (-0400)
Subject: mon/OSDMonitor: report crush_version for get and set crush map
X-Git-Tag: v12.1.0~58^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d54c0963af36918f424f4f348f535df895c0328;p=ceph.git

mon/OSDMonitor: report crush_version for get and set crush map

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 1d2483ba7fce..941a2f89de83 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4201,7 +4201,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
       ss << "got osdmap epoch " << p->get_epoch();
     } else if (prefix == "osd getcrushmap") {
       p->crush->encode(rdata, mon->get_quorum_con_features());
-      ss << "got crush map from osdmap epoch " << p->get_epoch();
+      ss << p->get_crush_version();
     } else if (prefix == "osd ls-tree") {
       string bucket_name;
       cmd_getval(g_ceph_context, cmdmap, "name", bucket_name);
@@ -7273,7 +7273,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     dout(10) << " result " << ess.str() << dendl;
 
     pending_inc.crush = data;
-    ss << "set crush map";
+    ss << osdmap.get_crush_version() + 1;
     goto update;
 
   } else if (prefix == "osd crush set-device-class") {