osd: kill sub_op_scrub_stop, it never works

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

diff --git a/src/include/rados.h b/src/include/rados.h
index c58277fdc6c08eb8648bf688d3173f64e6939ca6..edb094baec47af087d37f8110681d3e7f28aca11 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -281,8 +281,7 @@ extern const char *ceph_osd_state_name(int s);
        f(SCRUB,        __CEPH_OSD_OP1(SUB, 5),         "scrub")            \
        f(SCRUB_RESERVE, __CEPH_OSD_OP1(SUB, 6),        "scrub-reserve")    \
        f(SCRUB_UNRESERVE, __CEPH_OSD_OP1(SUB, 7),      "scrub-unreserve")  \
-       f(SCRUB_STOP,   __CEPH_OSD_OP1(SUB, 8),         "scrub-stop")       \
-       f(SCRUB_MAP,    __CEPH_OSD_OP1(SUB, 9),         "scrub-map")        \
+       f(SCRUB_MAP,    __CEPH_OSD_OP1(SUB, 8),         "scrub-map")        \
                                                                            \
        /** exec **/                                                        \
        /* note: the RD bit here is wrong; see special-case below in helper */ \

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7e5845e3c310662f90d7f77e065ccb40e7c69ce4..abb62fc59e584a5c2a473d719f23572644d6346f 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3569,22 +3569,6 @@ void PG::sub_op_scrub_unreserve(OpRequestRef op)
   clear_scrub_reserved();
 }
 
-void PG::sub_op_scrub_stop(OpRequestRef op)
-{
-  op->mark_started();
-
-  MOSDSubOp *m = static_cast<MOSDSubOp*>(op->get_req());
-  assert(m->get_type() == MSG_OSD_SUBOP);
-  dout(7) << "sub_op_scrub_stop" << dendl;
-
-  // see comment in sub_op_scrub_reserve
-  scrubber.reserved = false;
-
-  MOSDSubOpReply *reply = new MOSDSubOpReply(
-    m, pg_whoami, 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ACK);
-  osd->send_message_osd_cluster(reply, m->get_connection());
-}
-
 void PG::reject_reservation()
 {
   osd->send_message_osd_cluster(

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 50a8d72f06fa4af10b85d1eed73f324d423d8eb2..647ae68f681e3d35a8eb5d9d86275e06952e8088 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1324,7 +1324,6 @@ public:
   void sub_op_scrub_reserve(OpRequestRef op);
   void sub_op_scrub_reserve_reply(OpRequestRef op);
   void sub_op_scrub_unreserve(OpRequestRef op);
-  void sub_op_scrub_stop(OpRequestRef op);
 
   void reject_reservation();
   void schedule_backfill_full_retry();

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d52b2653579750670ebe3c1ad4e84871ea59b556..800dba6ef3d3e01fbb1f5a73327aca802071434a 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3202,9 +3202,6 @@ void ReplicatedPG::do_sub_op(OpRequestRef op)
     case CEPH_OSD_OP_SCRUB_UNRESERVE:
       sub_op_scrub_unreserve(op);
       return;
-    case CEPH_OSD_OP_SCRUB_STOP:
-      sub_op_scrub_stop(op);
-      return;
     case CEPH_OSD_OP_SCRUB_MAP:
       sub_op_scrub_map(op);
       return;