osd: drop C_UpdateLastRollbackInfoTrimmedToApplied

The variable can probably be removed as well, but leaving that for another
time.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 554ae9199d78c6e43627dd8bb394ce181a0c3ebf..de09c98b8049a9aa4a51f3a66384d1cc8bbc363d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3391,11 +3391,7 @@ void PG::append_log(
     pg_log.roll_forward_to(
       roll_forward_to,
       &handler);
-    t.register_on_applied(
-      new C_UpdateLastRollbackInfoTrimmedToApplied(
-       this,
-       get_osdmap()->get_epoch(),
-       roll_forward_to));
+    last_rollback_info_trimmed_to_applied = roll_forward_to;
   }
 
   pg_log.trim(trim_to, info);

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 91431cb2c46847a42d7436041100c287120ed337..8f75e980b21b810a1bd0fb251146f9f3c690ccbb 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -829,27 +829,7 @@ protected:
   eversion_t  last_complete_ondisk;  // last_complete that has committed.
   eversion_t  last_update_applied;
 
-
-  struct C_UpdateLastRollbackInfoTrimmedToApplied : Context {
-    PGRef pg;
-    epoch_t e;
-    eversion_t v;
-    C_UpdateLastRollbackInfoTrimmedToApplied(PG *pg, epoch_t e, eversion_t v)
-      : pg(pg), e(e), v(v) {}
-    bool sync_finish(int r) override {
-      pg->last_rollback_info_trimmed_to_applied = v;
-      return true;
-    }
-    void finish(int) override {
-      pg->lock();
-      if (!pg->pg_has_reset_since(e)) {
-       pg->last_rollback_info_trimmed_to_applied = v;
-      }
-      pg->unlock();
-    }
-  };
-  // entries <= last_rollback_info_trimmed_to_applied have been trimmed,
-  // and the transaction has applied
+  // entries <= last_rollback_info_trimmed_to_applied have been trimmed
   eversion_t  last_rollback_info_trimmed_to_applied;
 
   // primary state