osd: leave recovery hooks in PG

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 90f611b475a59339f55447becf971973fdd604a7..803633badf8f5224dc08eb22f648881ea6a12798 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1389,18 +1389,36 @@ public:
   bool acting_up_affected(OSDMap &osdmap,
               const OSDMap &lastmap);
     
+  // recovery bits
+  void handle_notify(int from, PG::Info& i, RecoveryCtx *rctx) {
+    recovery_state.handle_notify(from, i, rctx);
+  }
+  void handle_info(int from, PG::Info& i, RecoveryCtx *rctx) {
+    recovery_state.handle_info(from, i, rctx);
+  }
+  void handle_log(int from,
+                 MOSDPGLog *msg,
+                 RecoveryCtx *rctx) {
+    recovery_state.handle_log(from, msg, rctx);
+  }
+  void handle_query(int from, const PG::Query& q, RecoveryCtx *rctx) {
+    recovery_state.handle_query(from, q, rctx);
+  }
+  void handle_advance_map(OSDMap &osdmap, OSDMap &lastmap, 
+                         RecoveryCtx *rctx) {
+    recovery_state.handle_advance_map(osdmap, lastmap, rctx);
+  }
+  void handle_activate_map(RecoveryCtx *rctx) {
+    recovery_state.handle_activate_map(rctx);
+  }
+  void handle_backlog_generated(RecoveryCtx *rctx) {
+    recovery_state.handle_backlog_generated(rctx);
+  }
+  void handle_create(RecoveryCtx *rctx) {
+    recovery_state.handle_create(rctx);
+  }
+
   // abstract bits
-  virtual void handle_notify(int from, PG::Info& i, RecoveryCtx *ctx) = 0;
-  virtual void handle_info(int from, PG::Info& i, RecoveryCtx *ctx) = 0;
-  virtual void handle_log(int from,
-                         MOSDPGLog *msg,
-                         RecoveryCtx *ctx) = 0;
-  virtual void handle_query(int from, const PG::Query& q, RecoveryCtx *ctx) = 0;
-  virtual void handle_advance_map(OSDMap &osdmap, OSDMap &lastmap, 
-                                 RecoveryCtx *ctx) = 0;
-  virtual void handle_activate_map(RecoveryCtx *ctx) = 0;
-  virtual void handle_backlog_generated(RecoveryCtx *ctx) = 0;
-  virtual void handle_create(RecoveryCtx *ctx) = 0;
   virtual void do_op(MOSDOp *op) = 0;
   virtual void do_sub_op(MOSDSubOp *op) = 0;
   virtual void do_sub_op_reply(MOSDSubOpReply *op) = 0;

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index ef83da2331e09053c79c40e398447fd1b512e085..cd60e4bf3adea3512dff66b3f62b1141d5d88825 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -663,34 +663,6 @@ public:
   ~ReplicatedPG() {}
 
 
-  void handle_notify(int from, PG::Info& i, RecoveryCtx *rctx) {
-    recovery_state.handle_notify(from, i, rctx);
-  }
-  void handle_info(int from, PG::Info& i, RecoveryCtx *rctx) {
-    recovery_state.handle_info(from, i, rctx);
-  }
-  void handle_log(int from,
-                 MOSDPGLog *msg,
-                 RecoveryCtx *rctx) {
-    recovery_state.handle_log(from, msg, rctx);
-  }
-  void handle_query(int from, const PG::Query& q, RecoveryCtx *rctx) {
-    recovery_state.handle_query(from, q, rctx);
-  }
-  void handle_advance_map(OSDMap &osdmap, OSDMap &lastmap, 
-                         RecoveryCtx *rctx) {
-    recovery_state.handle_advance_map(osdmap, lastmap, rctx);
-  }
-  void handle_activate_map(RecoveryCtx *rctx) {
-    recovery_state.handle_activate_map(rctx);
-  }
-  void handle_backlog_generated(RecoveryCtx *rctx) {
-    recovery_state.handle_backlog_generated(rctx);
-  }
-  void handle_create(RecoveryCtx *rctx) {
-    recovery_state.handle_create(rctx);
-  }
-
   void do_op(MOSDOp *op);
   void do_pg_op(MOSDOp *op);
   void do_sub_op(MOSDSubOp *op);