]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: only test crush ruleset for the newly created pool
authorSage Weil <sage@redhat.com>
Fri, 18 Sep 2015 13:41:25 +0000 (09:41 -0400)
committerSage Weil <sage@redhat.com>
Fri, 18 Sep 2015 13:41:25 +0000 (09:41 -0400)
Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 3b44b2d4b0c660c704328d79283ed9b45e48aa05..a7d18f8a4f3c12f0968899199156ae8317ab34ee 100644 (file)
@@ -4493,7 +4493,8 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid,
   CrushTester tester(newcrush, *ss);
   r = tester.test_with_crushtool(g_conf->crushtool.c_str(),
                                 osdmap.get_max_osd(),
-                                g_conf->mon_lease);
+                                g_conf->mon_lease,
+                                crush_ruleset);
   if (r) {
     dout(10) << " tester.test_with_crushtool returns " << r << dendl;
     return r;