From: x11562 <xie.na@h3c.com>
Date: Mon, 11 Jul 2016 09:52:13 +0000 (+0800)
Subject: mon: osdmap's epoch should be more than 0
X-Git-Tag: v11.1.0~149^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06281fdeed84ba7ba1385217b4767d5d18eca0c9;p=ceph.git

mon: osdmap's epoch should be more than 0

Signed-off-by: Na Xie <xie.na@h3c.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 56b409c6a049..46968153a278 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3104,11 +3104,9 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
 
     epoch_t epoch = 0;
     int64_t epochnum;
-    cmd_getval(g_ceph_context, cmdmap, "epoch", epochnum, (int64_t)0);
+    cmd_getval(g_ceph_context, cmdmap, "epoch", epochnum, (int64_t)osdmap.get_epoch());
     epoch = epochnum;
-    if (!epoch)
-      epoch = osdmap.get_epoch();
-
+    
     bufferlist osdmap_bl;
     int err = get_version_full(epoch, osdmap_bl);
     if (err == -ENOENT) {