From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 25 May 2015 11:22:34 +0000 (+0300)
Subject: rbd: document mount_timeout in the man page
X-Git-Tag: v9.0.2~117^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4756%2Fhead;p=ceph.git

rbd: document mount_timeout in the man page

With "rbd: timeout watch teardown on unmap with mount_timeout" going
into kernel 4.2, document its effect in the man page.

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

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index 455295114a6ca..ba09131c57de3 100644
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -422,6 +422,11 @@ the running kernel.
 
 * notcp_nodelay - Enable Nagle's algorithm on client sockets (since 4.0).
 
+* mount_timeout=x - A timeout on various steps in `rbd map` and `rbd unmap`
+  sequences (default is 60 seconds).  In particular, since 4.2 this can be used
+  to ensure that `rbd unmap` eventually times out when there is no network
+  connection to a cluster.
+
 * osdkeepalive=x - OSD keepalive timeout (default is 5 seconds).
 
 * osd_idle_ttl=x - OSD idle TTL (default is 60 seconds).