From 7e89f51d8fc4062d92bcfed0b92a0fc0915e50fc Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 27 Feb 2015 16:15:57 +0100 Subject: [PATCH] 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 --- src/crush/CrushTester.cc | 1 - src/tools/crushtool.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc index 33ec0e090ad3..10ea397469fc 100644 --- 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 3f9d086a96aa..f332186fa88f 100644 --- 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) { -- 2.47.3