ReplicatedPG: pass on dump_recovery_info to PGBackend

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 427e50e283c7fd7d8737a4122672dde77a4252c1..32300222b05d4b2a7063d03053e9bfeefa19cd40 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -616,54 +616,17 @@ protected:
       f->close_section();
     }
     {
-      f->open_array_section("pull_from_peer");
-      for (map<int, set<hobject_t> >::const_iterator i = pull_from_peer.begin();
-          i != pull_from_peer.end();
+      f->open_array_section("recovering");
+      for (set<hobject_t>::const_iterator i = recovering.begin();
+          i != recovering.end();
           ++i) {
-       f->open_object_section("pulling_from");
-       f->dump_int("pull_from", i->first);
-       {
-         f->open_array_section("pulls");
-         for (set<hobject_t>::const_iterator j = i->second.begin();
-              j != i->second.end();
-              ++j) {
-           f->open_object_section("pull_info");
-           assert(pulling.count(*j));
-           pulling.find(*j)->second.dump(f);
-           f->close_section();
-         }
-         f->close_section();
-       }
-       f->close_section();
+       f->dump_stream("object") << *i;
       }
       f->close_section();
     }
     {
-      f->open_array_section("pushing");
-      for (map<hobject_t, map<int, PushInfo> >::const_iterator i =
-            pushing.begin();
-          i != pushing.end();
-          ++i) {
-       f->open_object_section("object");
-       f->dump_stream("pushing") << i->first;
-       {
-         f->open_array_section("pushing_to");
-         for (map<int, PushInfo>::const_iterator j = i->second.begin();
-              j != i->second.end();
-              ++j) {
-           f->open_object_section("push_progress");
-           f->dump_stream("object_pushing") << j->first;
-           {
-             f->open_object_section("push_info");
-             j->second.dump(f);
-             f->close_section();
-           }
-           f->close_section();
-         }
-         f->close_section();
-       }
-       f->close_section();
-      }
+      f->open_object_section("pg_backend");
+      pgbackend->dump_recovery_info(f);
       f->close_section();
     }
   }