PG: unify scrub_received_maps and peer_scrub_maps

Previously, incoming maps were placed into peer_scrub_maps and merged
into scrub_received_maps during scrub_gather_replica_maps.  Now,
sub_op_scrub_map merges the maps into scrub_received_maps directly.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 782106228fa66145ee462ed356b965bac5ca83bb..d2fefd5961f86ab8d56f43009e5e5a31baec02d4 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1322,7 +1322,6 @@ void PG::clear_primary_state()
   log.reset_recovery_pointers();
 
   scrub_reserved_peers.clear();
-  peer_scrub_map.clear();
   osd->recovery_wq.dequeue(this);
   osd->snap_trim_wq.dequeue(this);
 }
@@ -2809,17 +2808,21 @@ void PG::sub_op_scrub_map(MOSDSubOp *op)
 
   int from = op->get_source().num();
 
-  if (peer_scrub_map.count(from)) {
-    dout(10) << " already had osd" << from << " scrub map" << dendl;
+  dout(10) << " got osd" << from << " scrub map" << dendl;
+  bufferlist::iterator p = op->get_data().begin();
+  if (scrub_received_maps.count(from)) {
+    ScrubMap incoming;
+    incoming.decode(p);
+    dout(10) << "from replica " << from << dendl;
+    dout(10) << "map version is " << incoming.valid_through << dendl;
+    scrub_received_maps[from].merge_incr(incoming);
   } else {
-    dout(10) << " got osd" << from << " scrub map" << dendl;
-    bufferlist::iterator p = op->get_data().begin();
-    peer_scrub_map[from].decode(p);
-    scrub_waiting_on--;
-    if (scrub_waiting_on == 0) {
-      assert(last_update_applied == info.last_update);
-      osd->scrub_finalize_wq.queue(this);
-    }
+    scrub_received_maps[from].decode(p);
+  }
+
+  if (--scrub_waiting_on == 0) {
+    assert(last_update_applied == info.last_update);
+    osd->scrub_finalize_wq.queue(this);
   }
 
   op->put();
@@ -3278,20 +3281,11 @@ void PG::scrub_clear_state()
 
 bool PG::scrub_gather_replica_maps() {
   assert(scrub_waiting_on == 0);
-  assert(peer_scrub_map.size() > 0 ||  acting.size() == 1);
   assert(_lock.is_locked());
 
-  for (map<int,ScrubMap>::iterator p = peer_scrub_map.begin();
-       p != peer_scrub_map.end();
-       peer_scrub_map.erase(p++)) {
-    
-    dout(10) << "from replica " << p->first << dendl;
-    dout(10) << "map version is " << p->second.valid_through << dendl;
-    if (scrub_received_maps.count(p->first)) {
-      scrub_received_maps[p->first].merge_incr(p->second);
-    } else {
-      scrub_received_maps[p->first] = p->second;
-    }
+  for (map<int,ScrubMap>::iterator p = scrub_received_maps.begin();
+       p != scrub_received_maps.end();
+       p++) {
     
     if (scrub_received_maps[p->first].valid_through != log.head) {
       scrub_waiting_on++;
@@ -3494,9 +3488,6 @@ void PG::scrub_finalize() {
     }
   }
 
-  // discard peer scrub info.
-  peer_scrub_map.clear();
-
   // ok, do the pg-type specific scrubbing
   _scrub(primary_scrubmap, errors, fixed);
 

diff --git a/src/osd/PG.h b/src/osd/PG.h
index da532fdbdf5db1664e099bdd057ea380550983ac..0ebad18c612486a437fc5e686bb949e403604f0a 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -896,7 +896,6 @@ public:
 
   // -- scrub --
   set<int> scrub_reserved_peers;
-  map<int,ScrubMap> peer_scrub_map;
   map<int,ScrubMap> scrub_received_maps;
   bool finalizing_scrub; 
   bool scrub_reserved, scrub_reserve_failed;