rados tool: remove -t param option for target pool

Bug #2772. This fixes an issue that was introduced when we
added the 'rados cp' command. The -t param was already used
for rados bench. With this change the only way to specify
a target pool is using --target-pool.
Though this problem is post argonaut, the 'rados cp' command
has been backported, so we need this fix there too.

Backport: argonaut

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/rados.cc b/src/rados.cc
index 42c0d1d568f0c6bc512d70cd21de492a598a8a44..1b1fec09312047c3205f2fb68bc43599f71231cf 100644 (file)
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -109,7 +109,6 @@ STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
 "   -p pool\n"
 "   --pool=pool\n"
 "        select given pool by name\n"
-"   -t pool\n"
 "   --target-pool=pool\n"
 "        select target pool by name\n"
 "   -b op_size\n"
@@ -1746,7 +1745,7 @@ int main(int argc, const char **argv)
       opts["show-time"] = "true";
     } else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) {
       opts["pool"] = val;
-    } else if (ceph_argparse_witharg(args, i, &val, "-t", "--target-pool", (char*)NULL)) {
+    } else if (ceph_argparse_witharg(args, i, &val, "--target-pool", (char*)NULL)) {
       opts["target_pool"] = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--object-locator" , (char *)NULL)) {
       opts["object_locator"] = val;