From: Sage Weil <sage@redhat.com>
Date: Sat, 13 Dec 2014 15:50:57 +0000 (-0800)
Subject: osd: drop redundant check in handle_replica_op
X-Git-Tag: v0.90~1^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09c1648b32dbbb1dee4669c7a05680cb310b322a;p=ceph.git

osd: drop redundant check in handle_replica_op

This is what require_self_aliveness checks.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 283a5178c5efe..840aa75743000 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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))