Merge branch 'wip-pi'

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

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
index b1d3207862060d9a78d2fa888b99ee6ea6f17994,b5ae763f2b5b41a28f772b2e77d8768982ae0c0f..6e3aa4bb257bddaf188f9b36aa905a91b016f976
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -4258,14 -4270,9 +4281,14 @@@ void OSD::handle_pg_notify(OpRequestRe
         it++) {
      PG *pg = 0;
  
-     if (it->pgid.preferred() >= 0) {
-       dout(20) << "ignoring localized pg " << it->pgid << dendl;
++    if (it->first.pgid.preferred() >= 0) {
++      dout(20) << "ignoring localized pg " << it->first.pgid << dendl;
 +      continue;
 +    }
 +
      ObjectStore::Transaction *t;
      C_Contexts *fin;
-     pg = get_or_create_pg(*it, m->get_epoch(), from, created, true, &t, &fin);
+     pg = get_or_create_pg(it->first, it->second, m->get_epoch(), from, created, true, &t, &fin);
      if (!pg)
        continue;
  
@@@ -4359,17 -4363,12 +4384,17 @@@ void OSD::handle_pg_info(OpRequestRef o
  
    int created = 0;
  
-   for (vector<pg_info_t>::iterator p = m->pg_info.begin();
-        p != m->pg_info.end();
+   for (vector<pair<pg_info_t,pg_interval_map_t> >::iterator p = m->pg_list.begin();
+        p != m->pg_list.end();
         ++p) {
-     if (p->pgid.preferred() >= 0) {
-       dout(10) << "ignoring localized pg " << p->pgid << dendl;
++    if (p->first.pgid.preferred() >= 0) {
++      dout(10) << "ignoring localized pg " << p->first.pgid << dendl;
 +      continue;
 +    }
 +
      ObjectStore::Transaction *t = 0;
      C_Contexts *fin = 0;
-     PG *pg = get_or_create_pg(*p, m->get_epoch(), 
+     PG *pg = get_or_create_pg(p->first, p->second, m->get_epoch(), 
                              from, created, false, &t, &fin);
      if (!pg)
        continue;

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge