osdmaptool: add --pool option for --test-map-pgs mode to usage()

--test-map-pgs mode allows to map all pgs from either all pools or just
one pool.  Mention it in usage output.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

diff --git a/src/test/cli/osdmaptool/help.t b/src/test/cli/osdmaptool/help.t
index b8fd79b87eeff09eb81e4d18383d6e30e5eea108..2c5a41de95396abc6a1b154e45de8cff8d64d803 100644 (file)
--- a/src/test/cli/osdmaptool/help.t
+++ b/src/test/cli/osdmaptool/help.t
@@ -3,7 +3,7 @@
    usage: [--print] [--createsimple <numosd> [--clobber] [--pg_bits <bitsperosd>]] <mapfilename>
      --export-crush <file>   write osdmap's crush map to <file>
      --import-crush <file>   replace osdmap's crush map with <file>
-     --test-map-pgs          map all pgs
+     --test-map-pgs [--pool <poolid>] map all pgs
      --mark-up-in            mark osds up and in (but do not persist)
      --clear-temp            clear pg_temp and primary_temp
      --test-random           do random placements

diff --git a/src/test/cli/osdmaptool/missing-argument.t b/src/test/cli/osdmaptool/missing-argument.t
index 8d23d5f18ff36a5c8f920115ff9df1a5ef491719..d0740ab1df6bf37fb0fcf80aa9b50634c3b16953 100644 (file)
--- a/src/test/cli/osdmaptool/missing-argument.t
+++ b/src/test/cli/osdmaptool/missing-argument.t
@@ -3,7 +3,7 @@
    usage: [--print] [--createsimple <numosd> [--clobber] [--pg_bits <bitsperosd>]] <mapfilename>
      --export-crush <file>   write osdmap's crush map to <file>
      --import-crush <file>   replace osdmap's crush map with <file>
-     --test-map-pgs          map all pgs
+     --test-map-pgs [--pool <poolid>] map all pgs
      --mark-up-in            mark osds up and in (but do not persist)
      --clear-temp            clear pg_temp and primary_temp
      --test-random           do random placements

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 68096ebea8afc5ac1d869949711c2c826502fd4a..0db39da52cf16eed29c789efc5845160b2c33555 100644 (file)
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -34,7 +34,7 @@ void usage()
   cout << " usage: [--print] [--createsimple <numosd> [--clobber] [--pg_bits <bitsperosd>]] <mapfilename>" << std::endl;
   cout << "   --export-crush <file>   write osdmap's crush map to <file>" << std::endl;
   cout << "   --import-crush <file>   replace osdmap's crush map with <file>" << std::endl;
-  cout << "   --test-map-pgs          map all pgs" << std::endl;
+  cout << "   --test-map-pgs [--pool <poolid>] map all pgs" << std::endl;
   cout << "   --mark-up-in            mark osds up and in (but do not persist)" << std::endl;
   cout << "   --clear-temp            clear pg_temp and primary_temp" << std::endl;
   cout << "   --test-random           do random placements" << std::endl;