rbd: recognize queue_depth option

.. and also stress the difference between libceph and rbd mapping
options.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index 2d6108cfc71fc243d703b9d45af56f067bdc7d3e..e7724146e5613606a62aa6919d8868ecff736e58 100644 (file)
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -398,6 +398,8 @@ Most of these options are useful mainly for debugging and benchmarking.  The
 default values are set in the kernel and may therefore depend on the version of
 the running kernel.
 
+libceph (per client instance) options:
+
 * fsid=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee - FSID that should be assumed by
   the client.
 
@@ -411,8 +413,8 @@ the running kernel.
 
 * nocrc - Disable CRC32C checksumming for data writes.
 
-* cephx_require_signatures - Require cephx message signing, i.e. MSG_AUTH
-  feature bit (since 3.19, default).
+* cephx_require_signatures - Require cephx message signing (since 3.19,
+  default).
 
 * nocephx_require_signatures - Don't require cephx message signing (since
   3.19).
@@ -431,10 +433,14 @@ the running kernel.
 
 * osd_idle_ttl=x - OSD idle TTL (default is 60 seconds).
 
+Mapping (per block device) options:
+
 * rw - Map the image read-write (default).
 
 * ro - Map the image read-only.  Equivalent to --read-only.
 
+* queue_depth=x - queue depth (since 4.2, default is 128 requests).
+
 
 Examples
 ========

diff --git a/src/rbd.cc b/src/rbd.cc
index 2808f9b8ce4e40f18ab082dd2595fe418ed49c0a..f797474f57e3175ee30f23a0dcc27648069aa33e 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -2545,6 +2545,9 @@ static int parse_map_options(char *options)
         return 1;
     } else if (!strcmp(this_char, "rw") || !strcmp(this_char, "ro")) {
       put_map_option("rw", this_char);
+    } else if (!strcmp(this_char, "queue_depth")) {
+      if (put_map_option_value("queue_depth", value_char, map_option_int_cb))
+        return 1;
     } else {
       cerr << "rbd: unknown map option '" << this_char << "'" << std::endl;
       return 1;