rados: usage message

    Bad linebreaks, wrapping, stringification, missing doc for bench args

    Signed-off-by: Dan Mick <dan.mick@inktank.com>
    Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/rados.cc b/src/rados.cc
index 7b7248f446e785239d7334ae897186d22cf754c3..95bfbdbe1aba9616fbf406d91b020e3a1c248546 100644 (file)
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -15,6 +15,7 @@
 #include "include/types.h"
 
 #include "include/rados/librados.hpp"
+#include "rados_sync.h"
 using namespace librados;
 
 #include "common/obj_bencher.h"
@@ -45,7 +46,9 @@ using namespace librados;
 int rados_tool_sync(const std::map < std::string, std::string > &opts,
                              std::vector<const char*> &args);
 
-#define STR(x) #x
+// two steps seem to be necessary to do this right
+#define STR(x) _STR(x)
+#define _STR(x) #x
 
 void usage(ostream& out)
 {
@@ -58,7 +61,7 @@ void usage(ostream& out)
 "   rmpool <pool-name>               remove pool <pool-name>'\n"
 "   mkpool <pool-name>               create the pool <pool-name>\n"
 "   df                              show per-pool and total usage\n"
-"   ls                               list objects in pool\n\n"
+"   ls                               list objects in pool\n"
 "   chown 123                        change the pool owner to auid 123\n"
 "\n"
 "OBJECT COMMANDS\n"
@@ -75,12 +78,14 @@ void usage(ostream& out)
 "   lssnap                           list snaps\n"
 "   mksnap <snap-name>               create snap <snap-name>\n"
 "   rmsnap <snap-name>               remove snap <snap-name>\n"
-"   rollback <obj-name> <snap-name>  roll back object to snap <snap-name>\n\n"
+"   rollback <obj-name> <snap-name>  roll back object to snap <snap-name>\n"
+"\n"
 "   bench <seconds> write|seq|rand [-t concurrent_operations]\n"
 "                                    default is 16 concurrent IOs and 4 MB ops\n"
 "   load-gen [options]               generate load on the cluster\n"
 "   listomapkeys <obj-name>          list the keys in the object map\n"
-"   getomapval <obj-name> <key>      show the value for the specified key in the object's object map"
+"   getomapval <obj-name> <key>      show the value for the specified key\n"
+                                    "in the object's object map\n"
 "   setomapval <obj-name> <key> <val>\n"
 "   listomapvals <obj-name> <key> <val>\n"
 "   rmomapkey <obj-name> <key> <val>\n"
@@ -97,17 +102,17 @@ void usage(ostream& out)
 "       -d / --delete-after          After synchronizing, delete unreferenced\n"
 "                                    files or objects from the target bucket\n"
 "                                    or directory.\n"
-"       --workers                    Number of worker threads to spawn (default "
-STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
+"       --workers                    Number of worker threads to spawn \n"
+"                                    default " STR(DEFAULT_NUM_RADOS_WORKER_THREADS) "\n"
 "\n"
 "GLOBAL OPTIONS:\n"
 "   --object_locator object_locator\n"
-"        set object_locator for operation"
+"        set object_locator for operation\n"
 "   -p pool\n"
 "   --pool=pool\n"
 "        select given pool by name\n"
 "   -b op_size\n"
-"        set the size of write ops for put or benchmarking"
+"        set the size of write ops for put or benchmarking\n"
 "   -s name\n"
 "   --snap name\n"
 "        select given snap name for (read) IO\n"
@@ -118,6 +123,9 @@ STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
 "        create the pool or directory that was specified\n"
 "\n"
 "BENCH OPTIONS:\n"
+"   -t N\n"
+"   --concurrent-ios=N\n"
+"        Set number of concurrent I/O operations\n"
 "   --show-time\n"
 "        prefix output with date/time\n"
 "\n"
@@ -132,7 +140,6 @@ STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
 "   --target-throughput              target throughput (in MB)\n"
 "   --run-length                     total time (in seconds)\n";
 
-
 }
 
 static void usage_exit()