From 2769da40d7baff84c2c19de8cf3a132fcd548b95 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 12 Mar 2015 14:27:32 +0300 Subject: [PATCH] rbd: recognize cephx_require_signatures and tcp_nodelay options Support for these went into 3.19 and 4.0 kernels respectively. Signed-off-by: Ilya Dryomov --- doc/man/8/rbd.rst | 11 +++++++++++ man/rbd.8 | 11 +++++++++++ src/rbd.cc | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index d55f78951ee3..7dd1d08e5ef3 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -366,6 +366,17 @@ 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). + +* nocephx_require_signatures - Don't require cephx message signing (since + 3.19). + +* tcp_nodelay - Disable Nagle's algorithm on client sockets (since 4.0, + default). + +* notcp_nodelay - Enable Nagle's algorithm on client sockets (since 4.0). + * osdkeepalive=x - OSD keepalive timeout (default is 5 seconds). * osd_idle_ttl=x - OSD idle TTL (default is 60 seconds). diff --git a/man/rbd.8 b/man/rbd.8 index 4185dfc366af..64f387393f6f 100644 --- a/man/rbd.8 +++ b/man/rbd.8 @@ -435,6 +435,17 @@ crc \- Enable CRC32C checksumming for data writes (default). .IP \(bu 2 nocrc \- Disable CRC32C checksumming for data writes. .IP \(bu 2 +cephx_require_signatures \- Require cephx message signing, i.e. MSG_AUTH +feature bit (since 3.19, default). +.IP \(bu 2 +nocephx_require_signatures \- Don\(aqt require cephx message signing (since +3.19). +.IP \(bu 2 +tcp_nodelay \- Disable Nagle\(aqs algorithm on client sockets (since 4.0, +default). +.IP \(bu 2 +notcp_nodelay \- Enable Nagle\(aqs algorithm on client sockets (since 4.0). +.IP \(bu 2 osdkeepalive=x \- OSD keepalive timeout (default is 5 seconds). .IP \(bu 2 osd_idle_ttl=x \- OSD idle TTL (default is 60 seconds). diff --git a/src/rbd.cc b/src/rbd.cc index 553255b6563b..e7ed6369b820 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -2398,6 +2398,12 @@ static int parse_map_options(char *options) put_map_option("share", this_char); } else if (!strcmp(this_char, "crc") || !strcmp(this_char, "nocrc")) { put_map_option("crc", this_char); + } else if (!strcmp(this_char, "cephx_require_signatures") || + !strcmp(this_char, "nocephx_require_signatures")) { + put_map_option("cephx_require_signatures", this_char); + } else if (!strcmp(this_char, "tcp_nodelay") || + !strcmp(this_char, "notcp_nodelay")) { + put_map_option("tcp_nodelay", this_char); } else if (!strcmp(this_char, "mount_timeout")) { if (put_map_option_value("mount_timeout", value_char, map_option_int_cb)) return 1; -- 2.47.3