tools/rados: Unmask '-o' to restore original behaviour

0b369e1aff1 masked the original behaviour of '-o' which was to indicate
'outfile' as documented in the man page. Changing object-size to capital
o will restore the original behaviour.

Fixes: https://tracker.ceph.com/issues/42477
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit d2b806070de5f56474283035a7ffc91fe96afbab)

Conflicts:
	PendingReleaseNotes: trivial resolution

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index a48aee634ab4c94bd85adda87a4aeaf1f368367a..46f33bc5da97311a87b40634895bc62f8a6282d3 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -14,4 +14,9 @@
 
     ceph osd pool set <pool-name> pg_autoscale_mode warn
 
+* The behaviour of the ``-o`` argument to the rados tool has been reverted to
+  its orignal behaviour of indicating an output file. This reverts it to a more
+  consistent behaviour when compared to other tools. Specifying object size is now
+  accomplished by using an upper case O ``-O``.
+
 * The format of MDSs in `ceph fs dump` has changed.

diff --git a/doc/man/8/rados.rst b/doc/man/8/rados.rst
index 36b6c0b3e3610bb1d9b582b7f61cdebf79640b7d..710be7354fad268c6503d7765ef6e7b146469532 100644 (file)
--- a/doc/man/8/rados.rst
+++ b/doc/man/8/rados.rst
@@ -71,6 +71,10 @@ Options
    Available for stat, stat2, get, put, append, truncate, rm, ls
    and all xattr related operation
 
+.. option:: -O object_size
+
+   Set the object size for put/get ops and for write benchmarking
+
 
 Global commands
 ===============

diff --git a/qa/tasks/radosbench.py b/qa/tasks/radosbench.py
index 0ae705134913ce9606f86c39e28314ffc16f834b..1a8a0ab19bfd188620456c75cf6b04d0f92518a1 100644 (file)
--- a/qa/tasks/radosbench.py
+++ b/qa/tasks/radosbench.py
@@ -80,7 +80,7 @@ def task(ctx, config):
         if osize is 0:
             objectsize = []
         else:
-            objectsize = ['-o', str(osize)]
+            objectsize = ['-O', str(osize)]
         size = ['-b', str(config.get('size', 65536))]
         # If doing a reading run then populate data
         if runtype != "write":

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 6ec1df98d5039243cf80b3a12f84613999da4de4..c97671d7c02f3dbf35aa4357ccdee62d388ec85b 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -181,7 +181,7 @@ void usage(ostream& out)
 "   --format=[--format plain|json|json-pretty]\n"
 "   -b op_size\n"
 "        set the block size for put/get ops and for write benchmarking\n"
-"   -o object_size\n"
+"   -O object_size\n"
 "        set the object size for put/get ops and for write benchmarking\n"
 "   --max-objects\n"
 "        set the max number of objects for write benchmarking\n"
@@ -3960,7 +3960,7 @@ int main(int argc, const char **argv)
       opts["max-objects"] = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--offset", (char*)NULL)) {
       opts["offset"] = val;
-    } else if (ceph_argparse_witharg(args, i, &val, "-o", (char*)NULL)) {
+    } else if (ceph_argparse_witharg(args, i, &val, "-O", (char*)NULL)) {
       opts["object-size"] = val;
     } else if (ceph_argparse_witharg(args, i, &val, "-s", "--snap", (char*)NULL)) {
       opts["snap"] = val;