osd: add get_num_unfound() helper

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e256228e25017d84cd0766689273fcc9a8636de7..6fa5af376c974dff0f5e99ae0736d63a0886e569 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -579,8 +579,10 @@ void PG::discover_all_missing(map< int, map<pg_t,PG::Query> > &query_map)
 {
   assert(missing.have_missing());
 
-  dout(10) << __func__ << ": searching for " << missing.num_missing()
-          << " missing objects." << dendl;
+  dout(10) << __func__ << " "
+          << missing.num_missing() << " missing, "
+          << get_num_unfound() << " unfound"
+          << dendl;
 
   std::map<int,Info>::const_iterator end = peer_info.end();
   for (std::map<int,Info>::const_iterator pi = peer_info.begin();
@@ -2015,8 +2017,7 @@ void PG::update_stats()
       }
       pg_stats_stable.num_objects_degraded += degraded;
 
-      pg_stats_stable.num_objects_unfound =
-       missing.num_missing() - missing_loc.size();
+      pg_stats_stable.num_objects_unfound = get_num_unfound();
     }
 
     dout(15) << "update_stats " << pg_stats_stable.reported << dendl;
@@ -3405,7 +3406,7 @@ ostream& operator<<(ostream& out, const PG& pg)
   if (pg.missing.num_missing()) {
     out << " m=" << pg.missing.num_missing();
     if (pg.is_primary()) {
-      int unfound = pg.missing.num_missing() - pg.missing_loc.size();
+      int unfound = pg.get_num_unfound();
       if (unfound)
        out << " u=" << unfound;
     }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 84283efe52575ea346aa75a6b28f14289b9f884a..cd2e068bd3f3bf5678e927848527a515164126f4 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -852,6 +852,9 @@ public:
   bool have_unfound() const { 
     return missing.num_missing() > missing_loc.size();
   }
+  int get_num_unfound() const {
+    return missing.num_missing() - missing_loc.size();
+  }
 
   virtual void clean_up_local(ObjectStore::Transaction& t) = 0;