mon: do not pollute directory with cvs files from crushtool

The --output-csv option to crushtool will create files in the current
directory of the monitor. The only reason for using it is because
crushtool requires at least one option for display. Relax this
constraint in crushtool and remove the option from the call made by the
monitor to validate a new crushmap.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index 33ec0e090ad3982bf75f30ff173ffb740951445d..10ea397469fcf7b94405d646c20e9b995f4c8e13 100644 (file)
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -362,7 +362,6 @@ int CrushTester::test_with_crushtool()
   cmd_args.push_back("-i");
   cmd_args.push_back("-");
   cmd_args.push_back("--test");
-  cmd_args.push_back("--output-csv");
   cmd_args.push_back(NULL);
 
   int pipefds[2];

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 3f9d086a96aa36142e86ec6f1edbdedca2dc8e43..f332186fa88f3923f4e5fc09f648aa8ebac7e4e1 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -464,7 +464,6 @@ int main(int argc, const char **argv)
 
   if (test && !display && !write_to_file) {
     cerr << "WARNING: no output selected; use --output-csv or --show-X" << std::endl;
-    exit(EXIT_FAILURE);
   }
 
   if (decompile + compile + build > 1) {