Merge pull request #5404 from SUSE/wip-12395-firefly

register_new_pgs() should check ruleno instead of its index Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Sep 9, 2015 · 973b74d · 973b74d
2 parents 79403ba + 5445461
commit 973b74d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
@@ -1000,8 +1000,8 @@ bool PGMonitor::register_new_pgs()
        ++p) {
     int64_t poolid = p->first;
     pg_pool_t &pool = p->second;
-    int ruleno = pool.get_crush_ruleset();
-    if (!osdmap->crush->rule_exists(ruleno)) 
+    int ruleno = osdmap->crush->find_rule(pool.get_crush_ruleset(), pool.get_type(), pool.get_size());
+    if (ruleno < 0 || !osdmap->crush->rule_exists(ruleno))
       continue;
 
     if (pool.get_last_change() <= pg_map.last_pg_scan ||