mon/PGMonitor: fix segfault when osdmap and pgmap stats are out of sync

The leader mon is responsible for propagating changes in the osdmap into the pgmap (e.g., when a pool or osd goes away). If that hasn't happened yet, the pg_map map will be out of sync with the current set of pools. We shouldn't crash. Signed-off-by: Sage Weil <[email protected]>
dragonylffly · Sep 25, 2013 · 4d8f78b · 4d8f78b
1 parent aead63c
commit 4d8f78b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
@@ -1865,6 +1865,8 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
 	 p != pg_map.pg_pool_sum.end();
 	 ++p) {
       const pg_pool_t *pi = mon->osdmon()->osdmap.get_pg_pool(p->first);
+      if (!pi)
+	continue;   // in case osdmap changes haven't propagated to PGMap yet
       if (pi->get_pg_num() > pi->get_pgp_num()) {
 	ostringstream ss;
 	ss << "pool " << mon->osdmon()->osdmap.get_pool_name(p->first) << " pg_num "