objecter: better pg state debug output

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index acba49f2d3734ba0750bf6b90476a4c7293c5658..2b7ed2a6819038d173a06e4f7bf151f1ad42aa33 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -149,6 +149,17 @@ void Objecter::maybe_request_map()
 }
 
 
+Objecter::PG &Objecter::get_pg(pg_t pgid)
+{
+  if (!pg_map.count(pgid)) {
+    osdmap->pg_to_acting_osds(pgid, pg_map[pgid].acting);
+    dout(10) << "get_pg " << pgid << " is new, " << pg_map[pgid].acting << dendl;
+  } else {
+    dout(10) << "get_pg " << pgid << " is old, " << pg_map[pgid].acting << dendl;
+  }
+  return pg_map[pgid];
+}
+
 
 void Objecter::scan_pgs(set<pg_t>& changed_pgs)
 {
@@ -166,6 +177,8 @@ void Objecter::scan_pgs(set<pg_t>& changed_pgs)
 
     if (other == pg.acting) 
       continue; // no change.
+
+    dout(10) << "scan_pgs " << pgid << " " << pg.acting << " -> " << other << dendl;
     
     other.swap(pg.acting);
 

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 2e5d28dec4becc32caf4dc77800d2df6887b1fee..ddb7561548fa2a5575e28e7795d4828d34d7768d 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -175,11 +175,7 @@ class Objecter {
   hash_map<pg_t,PG> pg_map;
   
   
-  PG &get_pg(pg_t pgid) {
-    if (!pg_map.count(pgid)) 
-      osdmap->pg_to_acting_osds(pgid, pg_map[pgid].acting);
-    return pg_map[pgid];
-  }
+  PG &get_pg(pg_t pgid);
   void close_pg(pg_t pgid) {
     assert(pg_map.count(pgid));
     assert(pg_map[pgid].active_tids.empty());