osd/PG: remove last_updated_applied, op_applied()

No longer used or needed, yay!

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 16c7d1b52ad5a02f497e6c31b2bdac3cd9079139..b3878004676c6e97aa053f9c3187565d83f85336 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1615,7 +1615,6 @@ void PG::activate(ObjectStore::Transaction& t,
     last_update_ondisk = info.last_update;
     min_last_complete_ondisk = eversion_t(0,0);  // we don't know (yet)!
   }
-  last_update_applied = info.last_update;
   last_rollback_info_trimmed_to_applied = pg_log.get_can_rollback_to();
 
   need_up_thru = false;
@@ -4355,8 +4354,7 @@ void PG::repair_object(
 
 /* replica_scrub
  *
- * Wait for last_update_applied to match msg->scrub_to as above. Wait
- * for pushes to complete in case of recent recovery. Build a single
+ * Wait for pushes to complete in case of recent recovery. Build a single
  * scrubmap of objects that are in the range [msg->start, msg->end).
  */
 void PG::replica_scrub(

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 8a664c9607e053b380f652f3ef9faa4fed929d6f..ee3df4a958f5c691dafbddf3c3a1d2129dca3450 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -827,7 +827,6 @@ protected:
 protected:
   eversion_t  last_update_ondisk;    // last_update that has committed; ONLY DEFINED WHEN is_active()
   eversion_t  last_complete_ondisk;  // last_complete that has committed.
-  eversion_t  last_update_applied;
 
   // entries <= last_rollback_info_trimmed_to_applied have been trimmed
   eversion_t  last_rollback_info_trimmed_to_applied;

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index dccd8cc164facede5bc1faa70a10d7de635f30da..4af256c6dc561a3d4a3c597f3e1b9b1736a67a0e 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -9913,13 +9913,6 @@ void PrimaryLogPG::repop_all_committed(RepGather *repop)
   }
 }
 
-void PrimaryLogPG::op_applied(const eversion_t &applied_version)
-{
-  dout(10) << "op_applied version " << applied_version << dendl;
-  assert(applied_version == info.last_update);
-  last_update_applied = applied_version;
-}
-
 void PrimaryLogPG::eval_repop(RepGather *repop)
 {
   const MOSDOp *m = NULL;
@@ -10026,7 +10019,6 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
     repop->rep_tid,
     ctx->reqid,
     ctx->op);
-  op_applied(ctx->at_version);
 }
 
 PrimaryLogPG::RepGather *PrimaryLogPG::new_repop(
@@ -10221,7 +10213,6 @@ void PrimaryLogPG::submit_log_entries(
        new OnComplete{this, rep_tid, get_osdmap()->get_epoch()});
       int r = osd->store->queue_transaction(ch, std::move(t), NULL);
       assert(r == 0);
-      op_applied(info.last_update);
     });
 }
 
@@ -11197,7 +11188,6 @@ void PrimaryLogPG::do_update_log_missing(OpRequestRef &op)
     std::move(t),
     nullptr);
   assert(tr == 0);
-  op_applied(info.last_update);
 }
 
 void PrimaryLogPG::do_update_log_missing_reply(OpRequestRef &op)

diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index 0cdbc3a40a269620d14695e4c0f1a437d39e11e9..900a88a2e4631b9e15e0d780f4794d84ea1bf477 100644 (file)
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -414,8 +414,6 @@ public:
     append_log(logv, trim_to, roll_forward_to, t, transaction_applied);
   }
 
-  void op_applied(const eversion_t &applied_version);  // remove me
-
   bool should_send_op(
     pg_shard_t peer,
     const hobject_t &hoid) override {