From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 13:41:25 +0000 (-0400)
Subject: mon/OSDMonitor: only test crush ruleset for the newly created pool
X-Git-Tag: v0.94.4~15^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6635530aa94b1f21c3052e64d4dfe3952f98fe83;p=ceph.git

mon/OSDMonitor: only test crush ruleset for the newly created pool

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>
(cherry picked from commit 524b0bdcc45c2f4b95f2239c988e93250f337f3d)

Conflicts:
	src/mon/OSDMonitor.cc : trivial resolution
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b7be921598ad..d8470e7435e1 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4040,7 +4040,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)
     return r;
   unsigned size, min_size;