]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMonitor: drop redundant check of assert
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 11 Aug 2016 03:51:25 +0000 (11:51 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 17 Aug 2016 04:37:13 +0000 (12:37 +0800)
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>
src/mon/OSDMonitor.cc

index 19b8c9f48d982e20e2f9d735004ceb6e785c1a05..12dc730f0cca2c5e96f14c7a3358dd985449dadc 100644 (file)
@@ -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;