From: Samuel Just <sam.just@inktank.com>
Date: Sun, 27 Oct 2013 01:24:41 +0000 (-0700)
Subject: ReplicatedPG: improved on_flushed error output
X-Git-Tag: v0.72-rc1~10^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=420182a1e89f0fad1e7bf8ecd18bc9e12c3477cc;p=ceph.git

ReplicatedPG: improved on_flushed error output

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 899b638ee664..1d610ac20e1f 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7291,6 +7291,16 @@ void ReplicatedPG::apply_and_flush_repops(bool requeue)
   waiting_for_ack.clear();
 }
 
+void ReplicatedPG::on_flushed()
+{
+  pair<hobject_t, ObjectContextRef> i;
+  while (object_contexts.get_next(i.first, &i)) {
+    derr << "on_flushed: object " << i.first << " obc still alive" << dendl;
+  }
+  assert(object_contexts.empty());
+  pgbackend->on_flushed();
+}
+
 void ReplicatedPG::on_removal(ObjectStore::Transaction *t)
 {
   dout(10) << "on_removal" << dendl;
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index bae8544183a6..181da6e6bf62 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -1091,10 +1091,7 @@ public:
   void on_role_change();
   void on_change(ObjectStore::Transaction *t);
   void on_activate();
-  void on_flushed() {
-    assert(object_contexts.empty());
-    pgbackend->on_flushed();
-  }
+  void on_flushed();
   void on_removal(ObjectStore::Transaction *t);
   void on_shutdown();
 };