Accepting request 602969 from home:morbidrsa

- Add keep-alive-tmo option to connect-all command (bsc#1090568)
  + 0005-fabrics-add-option-to-supply-keep-alive-timeout-for.patch

OBS-URL: https://build.opensuse.org/request/show/602969
OBS-URL: https://build.opensuse.org/package/show/Base:System/nvme-cli?expand=0&rev=57
This commit is contained in:
Johannes Thumshirn 2018-05-07 07:11:22 +00:00 committed by Git OBS Bridge
parent 1e49e3e362
commit 6e200935bb
3 changed files with 62 additions and 0 deletions

View File

@ -0,0 +1,54 @@
From: Johannes Thumshirn <jthumshirn@suse.de>
Date: Wed, 25 Apr 2018 11:49:23 -0600
Subject: fabrics: add option to supply keep-alive-timeout for connect-all
References: bsc#1090568
Git-commit: 7099227b07a86f152fa62b9a96f77a2f3e22f59f
Patch-mainline: v1.6
Currently we can't supply a keep-alive-timeout when doing a nvme
connect-all, but we can supply it when doing nvme connect.
Bring connect-all in line with connect.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---
Documentation/nvme-connect-all.txt | 5 +++++
fabrics.c | 1 +
2 files changed, 6 insertions(+)
diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index 03adac5..217268f 100644
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -14,6 +14,7 @@ SYNOPSIS
[--trsvcid=<trsvcid> | -s <trsvcid>]
[--host-traddr=<traddr> | -w <traddr>]
[--hostnqn=<hostnqn> | -q <hostnqn>]
+ [--keep-alive-tmo=<#> | -k <#>]
[--raw=<filename> | -r <filename>]
DESCRIPTION
@@ -86,6 +87,10 @@ OPTIONS
Overrides the default number of elements in the I/O queues created
by the driver.
+-k <#>::
+--keep-alive-tmo=<#>::
+ Overrides the default keep alive timeout (in seconds).
+
EXAMPLES
--------
* Connect to all records returned by the Discover Controller with IP4 address
diff --git a/fabrics.c b/fabrics.c
index 62bd3be..7e9d56c 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -821,6 +821,7 @@ int discover(const char *desc, int argc, char **argv, bool connect)
{"queue-size", 'Q', "LIST", CFG_STRING, &cfg.queue_size, required_argument, "number of io queue elements to use (default 128)" },
{"nr-io-queues",'i', "LIST", CFG_STRING, &cfg.nr_io_queues,required_argument, "number of io queues to use (default is core count)" },
{"raw", 'r', "LIST", CFG_STRING, &cfg.raw, required_argument, "raw output file" },
+ {"keep-alive-tmo", 'k', "LIST", CFG_STRING, &cfg.keep_alive_tmo, required_argument, "keep alive timeout period in seconds" },
{NULL},
};

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 2 07:49:52 UTC 2018 - jthumshirn@suse.com
- Add keep-alive-tmo option to connect-all command (bsc#1090568)
+ 0005-fabrics-add-option-to-supply-keep-alive-timeout-for.patch
-------------------------------------------------------------------
Thu Apr 12 08:22:04 UTC 2018 - jthumshirn@suse.com

View File

@ -33,6 +33,7 @@ Patch1: 0001-nvme-cli-add-NetApp-plugin.patch
Patch2: 0002-nvme-cli-add-netapp-smdevices-man-page.patch
Patch3: 0003-get-log-Make-log-identifier-a-required-parameter.patch
Patch4: 0004-Documentation-add-manpage-entry-for-connect-s-ctrl-l.patch
Patch5: 0005-fabrics-add-option-to-supply-keep-alive-timeout-for.patch
%description
NVM Express (NVMe) is a direct attached storage interface. The
@ -45,6 +46,7 @@ dependencies.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
echo %{version} > version