PG: remove sub_op_scrub

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9d3126a6ae99a27a249130a5b4e4699d2c73dcfc..c1dcc4d8abf90e3d28173756714c3e34657745f1 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2807,41 +2807,6 @@ bool PG::sched_scrub()
   return ret;
 }
 
-void PG::sub_op_scrub(MOSDSubOp *op)
-{
-  dout(7) << "sub_op_scrub" << dendl;
-
-  if (op->map_epoch < info.history.same_acting_since) {
-    dout(10) << "sub_op_scrub discarding old sub_op from "
-            << op->map_epoch << " < " << info.history.same_acting_since << dendl;
-    op->put();
-    return;
-  }
-
-  ScrubMap map;
-  if (op->version > eversion_t()) {
-    epoch_t epoch = info.history.same_acting_since;
-    finalizing_scrub = 1;
-    while (last_update_applied != info.last_update) {
-      wait();
-      if (epoch != info.history.same_acting_since ||
-         osd->is_stopping()) {
-       dout(10) << "scrub  pg changed, aborting" << dendl;
-       return;
-      }
-    }
-    build_inc_scrub_map(map, op->version);
-    finalizing_scrub = 0;
-  } else {
-    build_scrub_map(map);
-  }
-
-  MOSDSubOpReply *reply = new MOSDSubOpReply(op, 0, osd->osdmap->get_epoch(), CEPH_OSD_FLAG_ACK); 
-  ::encode(map, reply->get_data());
-  osd->cluster_messenger->send_message(reply, op->get_connection());
-
-  op->put();
-}
 
 void PG::sub_op_scrub_map(MOSDSubOp *op)
 {

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 33dc226b9929f20d7fcbca47967e056d60823753..31477d6ae9693dc7bb40da3f0ec4afde80564bc3 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -911,7 +911,6 @@ public:
   bool sched_scrub();
 
   void replica_scrub(class MOSDRepScrub *op);
-  void sub_op_scrub(class MOSDSubOp *op);
   void sub_op_scrub_map(class MOSDSubOp *op);
   void sub_op_scrub_reserve(class MOSDSubOp *op);
   void sub_op_scrub_reserve_reply(class MOSDSubOpReply *op);

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7e5f50e1bef301fa8caa03092cb2fa5afcd8b0a3..be859df027ab4b0216b34130d6b69c66b159cf05 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -481,9 +481,6 @@ void ReplicatedPG::do_sub_op(MOSDSubOp *op)
     case CEPH_OSD_OP_PUSH:
       sub_op_push(op);
       return;
-    case CEPH_OSD_OP_SCRUB:
-      sub_op_scrub(op);
-      return;
     case CEPH_OSD_OP_SCRUB_RESERVE:
       sub_op_scrub_reserve(op);
       return;