From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 11 Aug 2016 03:51:25 +0000 (+0800)
Subject: osd/OSDMonitor: drop redundant check of assert
X-Git-Tag: ses5-milestone5~86^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3f618906d473a99e99202dabedcefcbb75f8143;p=ceph.git

osd/OSDMonitor: drop redundant check of assert

Below here version can never be identical to osdmap.epoch,
otherwise we shall have returned above.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 19b8c9f48d98..12dc730f0cca 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -141,7 +141,7 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
   version_t version = get_last_committed();
   if (version == osdmap.epoch)
     return;
-  assert(version >= osdmap.epoch);
+  assert(version > osdmap.epoch);
 
   dout(15) << "update_from_paxos paxos e " << version
 	   << ", my e " << osdmap.epoch << dendl;