]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop redundant check in handle_replica_op
authorSage Weil <sage@redhat.com>
Sat, 13 Dec 2014 15:50:57 +0000 (07:50 -0800)
committerSage Weil <sage@redhat.com>
Sat, 13 Dec 2014 16:03:00 +0000 (08:03 -0800)
This is what require_self_aliveness checks.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index 283a5178c5efe23bb25e1ded405aa1e24217fb79..840aa757430005bc6b8a3cd04326a71cfe1d9e8d 100644 (file)
@@ -8060,12 +8060,6 @@ void OSD::handle_replica_op(OpRequestRef& op, OSDMapRef& osdmap)
   assert(m->get_header().type == MSGTYPE);
 
   dout(10) << __func__ << " " << *m << " epoch " << m->map_epoch << dendl;
-  epoch_t up_epoch = service.get_up_epoch();
-  if (m->map_epoch < up_epoch) {
-    dout(3) << "replica op from before up" << dendl;
-    return;
-  }
-
   if (!require_self_aliveness(op, m->map_epoch))
     return;
   if (!require_osd_peer(op))