From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Aug 2015 20:40:34 +0000 (-0400)
Subject: crush/CrushTester: test fewer inputs when running crushtool
X-Git-Tag: v0.94.4~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6192%2Fhead;p=ceph.git

crush/CrushTester: test fewer inputs when running crushtool

If there are a lot of crush rules (say, 100) then the test can
take a long time.  100 values per rule should be enough to catch
most issues.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0f82f461b33d93d868e185912a2c7e4074d06900)

Conflicts:
	src/crush/CrushTester.cc
	  in hammer the crushtool validation is via a shell
    	  and not via an internal subprocess utility
---

diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index 24db70ee6d81..d2be1f045731 100644
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -373,6 +373,10 @@ int CrushTester::test_with_crushtool(const string& crushtool,
   cmd_args.push_back("--test");
   cmd_args.push_back("--check");
   cmd_args.push_back(opt_max_id.c_str());
+  cmd_args.push_back("--min-x");
+  cmd_args.push_back("1");
+  cmd_args.push_back("--max-x");
+  cmd_args.push_back("50");
   if (ruleset >= 0) {
     cmd_args.push_back("--ruleset");
     cmd_args.push_back(stringify(ruleset).c_str());