From: Ilya Dryomov Date: Fri, 20 Apr 2018 14:33:20 +0000 (+0200) Subject: doc: lock_timeout is a per mapping option X-Git-Tag: v13.1.0~175^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21563%2Fhead;p=ceph.git doc: lock_timeout is a per mapping option Signed-off-by: Ilya Dryomov --- diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index 299e6410bc5..28e0429476b 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -647,9 +647,6 @@ Per client instance `rbd device map` options: since 4.2 this can be used to ensure that `rbd device unmap` eventually times out when there is no network connection to a cluster. -* lock_timeout=x - A timeout on waiting for the acquisition of exclusive lock - (since 4.17, default is 0 seconds, meaning no timeout). - * osdkeepalive=x - OSD keepalive timeout (default is 5 seconds). * osd_idle_ttl=x - OSD idle TTL (default is 60 seconds). @@ -667,6 +664,9 @@ Per mapping (block device) `rbd device map` options: * exclusive - Disable automatic exclusive lock transitions (since 4.12). +* lock_timeout=x - A timeout on waiting for the acquisition of exclusive lock + (since 4.17, default is 0 seconds, meaning no timeout). + * notrim - Turn off discard and write zeroes offload support to avoid deprovisioning a fully provisioned image (since 4.17). When enabled, discard requests will fail with -EOPNOTSUPP, write zeroes requests will fall back to