From: xie xingguo Date: Sat, 9 Jan 2016 01:18:12 +0000 (+0800) Subject: CrushTool: fix typo and improve indention X-Git-Tag: v10.0.3~32^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e063eddd8a78c189603647610aa89a2271e1864f;p=ceph.git CrushTool: fix typo and improve indention Signed-off-by: xie xingguo --- diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t old mode 100644 new mode 100755 index 8ed038b12bc2..e5ead0824053 --- a/src/test/cli/crushtool/help.t +++ b/src/test/cli/crushtool/help.t @@ -22,10 +22,11 @@ [--outfn|-o outfile] specify output for for (de)compilation --compile|-c map.txt compile a map from source - --enable-unsafe-tunables compile with unsafe tunables + --enable-unsafe-tunables + compile with unsafe tunables --build --num_osds N layer1 ... build a new map, where each 'layer' is - 'name (uniform|straw|list|tree) size' + 'name (uniform|straw|list|tree) size' Options for the tunables adjustments stage @@ -75,7 +76,7 @@ number generator in place of the CRUSH algorithm --show-utilization show OSD usage - --show utilization-all + --show-utilization-all include zero weight items --show-statistics show chi squared statistics --show-mappings show mappings @@ -92,23 +93,23 @@ Options for the output stage [--outfn|-o outfile] - specify output for for modified crush map + specify output for modified crush map $ crushtool --help-output data output from testing routine ... - absolute_weights - the decimal weight of each OSD - data layout: ROW MAJOR - OSD id (int), weight (int) + absolute_weights + the decimal weight of each OSD + data layout: ROW MAJOR + OSD id (int), weight (int) batch_device_expected_utilization_all - the expected number of objects each OSD should receive per placement batch - which may be a decimal value - data layout: COLUMN MAJOR - round (int), objects expected on OSD 0...OSD n (float) + the expected number of objects each OSD should receive per placement batch + which may be a decimal value + data layout: COLUMN MAJOR + round (int), objects expected on OSD 0...OSD n (float) batch_device_utilization_all - the number of objects stored on each OSD during each placement round - data layout: COLUMN MAJOR - round (int), objects stored on OSD 0...OSD n (int) + the number of objects stored on each OSD during each placement round + data layout: COLUMN MAJOR + round (int), objects stored on OSD 0...OSD n (int) device_utilization_all the number of objects stored on each OSD at the end of placements data_layout: ROW MAJOR diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index 1e56c6327f47..e0db67d478c0 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -68,19 +68,19 @@ static int get_fd_data(int fd, bufferlist &bl) void data_analysis_usage() { cout << "data output from testing routine ...\n"; -cout << " absolute_weights\n"; -cout << " the decimal weight of each OSD\n"; -cout << " data layout: ROW MAJOR\n"; -cout << " OSD id (int), weight (int)\n"; +cout << " absolute_weights\n"; +cout << " the decimal weight of each OSD\n"; +cout << " data layout: ROW MAJOR\n"; +cout << " OSD id (int), weight (int)\n"; cout << " batch_device_expected_utilization_all\n"; -cout << " the expected number of objects each OSD should receive per placement batch\n"; -cout << " which may be a decimal value\n"; -cout << " data layout: COLUMN MAJOR\n"; -cout << " round (int), objects expected on OSD 0...OSD n (float)\n"; +cout << " the expected number of objects each OSD should receive per placement batch\n"; +cout << " which may be a decimal value\n"; +cout << " data layout: COLUMN MAJOR\n"; +cout << " round (int), objects expected on OSD 0...OSD n (float)\n"; cout << " batch_device_utilization_all\n"; -cout << " the number of objects stored on each OSD during each placement round\n"; -cout << " data layout: COLUMN MAJOR\n"; -cout << " round (int), objects stored on OSD 0...OSD n (int)\n"; +cout << " the number of objects stored on each OSD during each placement round\n"; +cout << " data layout: COLUMN MAJOR\n"; +cout << " round (int), objects stored on OSD 0...OSD n (int)\n"; cout << " device_utilization_all\n"; cout << " the number of objects stored on each OSD at the end of placements\n"; cout << " data_layout: ROW MAJOR\n"; @@ -128,10 +128,11 @@ void usage() cout << " [--outfn|-o outfile]\n"; cout << " specify output for for (de)compilation\n"; cout << " --compile|-c map.txt compile a map from source\n"; - cout << " --enable-unsafe-tunables compile with unsafe tunables\n"; + cout << " --enable-unsafe-tunables\n"; + cout << " compile with unsafe tunables\n"; cout << " --build --num_osds N layer1 ...\n"; cout << " build a new map, where each 'layer' is\n"; - cout << " 'name (uniform|straw|list|tree) size'\n"; + cout << " 'name (uniform|straw|list|tree) size'\n"; cout << "\n"; cout << "Options for the tunables adjustments stage\n"; cout << "\n"; @@ -181,7 +182,7 @@ void usage() cout << " number generator in place of the CRUSH\n"; cout << " algorithm\n"; cout << " --show-utilization show OSD usage\n"; - cout << " --show utilization-all\n"; + cout << " --show-utilization-all\n"; cout << " include zero weight items\n"; cout << " --show-statistics show chi squared statistics\n"; cout << " --show-mappings show mappings\n"; @@ -198,7 +199,7 @@ void usage() cout << "Options for the output stage\n"; cout << "\n"; cout << " [--outfn|-o outfile]\n"; - cout << " specify output for for modified crush map\n"; + cout << " specify output for modified crush map\n"; cout << "\n"; }