import 15.2.9

[ceph.git] / ceph / src / osd / PeeringState.h

diff --git a/ceph/src/osd/PeeringState.h b/ceph/src/osd/PeeringState.h
index ede2258065b85b4abf587da70632ce65a84b7ea1..68f842104b03ab5a562d5f288eb90e141144189c 100644 (file)
--- a/ceph/src/osd/PeeringState.h
+++ b/ceph/src/osd/PeeringState.h
@@ -379,7 +379,8 @@ public:
     /// Notification of removal complete, t must be populated to complete removal
     virtual void on_removal(ObjectStore::Transaction &t) = 0;
     /// Perform incremental removal work
-    virtual void do_delete_work(ObjectStore::Transaction &t) = 0;
+    virtual ghobject_t do_delete_work(ObjectStore::Transaction &t,
+      ghobject_t _next) = 0;
 
     // ======================= PG Merge =========================
     virtual void clear_ready_to_merge() = 0;
@@ -1220,6 +1221,8 @@ public:
       boost::statechart::custom_reaction< DeleteSome >,
       boost::statechart::transition<DeleteInterrupted, WaitDeleteReserved>
       > reactions;
+    ghobject_t next;
+    ceph::mono_clock::time_point start;
     explicit Deleting(my_context ctx);
     boost::statechart::result react(const DeleteSome &evt);
     void exit();