osd: skip initial bit of peering if already have_master_log

Once we have settled on the master log, we want to skip that
step of peer().  Namely because peer() can be called on an
active PG if an osd shows up with stray content.  We still want
to peer() in that case in case there are missing objects to be
found.

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 6e997a3873911084173177152c729b861f84cb5b..58df608b74e8f7a4744569d1782497e1d8bcfb78 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -974,21 +974,10 @@ void PG::clear_primary_state()
   osd->recovery_wq.dequeue(this);
 }
 
-void PG::peer(ObjectStore::Transaction& t, 
-              map< int, map<pg_t,Query> >& query_map,
-             map<int, MOSDPGInfo*> *activator_map)
-{
-  dout(10) << "peer acting is " << acting << dendl;
-
-  if (!is_active())
-    state_set(PG_STATE_PEERING);
-  
-  if (prior_set.empty())
-    build_prior();
-
-  dout(10) << "peer prior_set is " << prior_set << dendl;
-  
 
+// if false, stop.
+bool PG::recover_master_log(map< int, map<pg_t,Query> >& query_map)
+{
   /** GET ALL PG::Info *********/
 
   // -- query info from everyone in prior_set.
@@ -1017,7 +1006,8 @@ void PG::peer(ObjectStore::Transaction& t,
       dout(10) << " not querying down osd" << *it << dendl;
     }
   }
-  if (missing_info) return;
+  if (missing_info)
+    return false;
 
   
   // -- ok, we have all (prior_set) info.  (and maybe others.)
@@ -1087,7 +1077,7 @@ void PG::peer(ObjectStore::Transaction& t,
       // try.  until then, just get the full backlogs.
       if (!log.backlog) {
        osd->queue_generate_backlog(this);
-       return;
+       return false;
       }
       
       if (peer_summary_requested.count(newest_update_osd)) {
@@ -1104,7 +1094,7 @@ void PG::peer(ObjectStore::Transaction& t,
        peer_summary_requested.insert(newest_update_osd);
       }
     }
-    return;
+    return false;
   } else {
     dout(10) << " newest_update " << info.last_update << " (me)" << dendl;
   }
@@ -1113,7 +1103,7 @@ void PG::peer(ObjectStore::Transaction& t,
 
   if (is_down()) {
     dout(10) << " down.  we wait." << dendl;    
-    return;
+    return false;
   }
 
   have_master_log = true;
@@ -1125,9 +1115,32 @@ void PG::peer(ObjectStore::Transaction& t,
              << log.bottom << " > oldest_update " << oldest_update
              << dendl;
     osd->queue_generate_backlog(this);
-    return;
+    return false;
   }
 
+  return true;
+}
+
+
+void PG::peer(ObjectStore::Transaction& t, 
+              map< int, map<pg_t,Query> >& query_map,
+             map<int, MOSDPGInfo*> *activator_map)
+{
+  dout(10) << "peer acting is " << acting << dendl;
+
+  if (!is_active())
+    state_set(PG_STATE_PEERING);
+  
+  if (prior_set.empty())
+    build_prior();
+
+  dout(10) << "peer prior_set is " << prior_set << dendl;
+  
+  
+  if (!have_master_log)
+    if (!recover_master_log(query_map))
+      return;
+
 
   /** COLLECT MISSING+LOG FROM PEERS **********/
   /*
@@ -1666,7 +1679,7 @@ void PG::trim_ondisklog_to(ObjectStore::Transaction& t, eversion_t v)
 
   map<__u64,eversion_t>::iterator p = ondisklog.block_map.begin();
   while (p != ondisklog.block_map.end()) {
-    dout(15) << "    " << p->first << " -> " << p->second << dendl;
+    //dout(15) << "    " << p->first << " -> " << p->second << dendl;
     p++;
     if (p == ondisklog.block_map.end() ||
         p->second > v) {  // too far!
@@ -1674,7 +1687,7 @@ void PG::trim_ondisklog_to(ObjectStore::Transaction& t, eversion_t v)
       break;
     }
   }
-  dout(15) << "  * " << p->first << " -> " << p->second << dendl;
+  //dout(15) << "  * " << p->first << " -> " << p->second << dendl;
   if (p == ondisklog.block_map.begin()) 
     return;  // can't trim anything!
   

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 0b3b1ea4afe221dab0a2c2082dd2beec177e0249..e4a0272ca31b677bab0c8e910ed91312b98b8ad7 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -716,6 +716,7 @@ public:
   
   void trim_write_ahead();
 
+  bool recover_master_log(map< int, map<pg_t,Query> >& query_map);
   void peer(ObjectStore::Transaction& t, 
            map< int, map<pg_t,Query> >& query_map,
            map<int, MOSDPGInfo*> *activator_map=0);