File 0013-nvme-discover-sanitize-options.patch of Package nvme-cli.10932
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 25 May 2018 10:26:37 +0200
Subject: [PATCH] nvme-discover: sanitize options
Git-commit: e4ac1a90b848796f45c8c7bca52ebc58a6b46f1a
References: bsc#1099018
The discovery controller doesn't accept any KATO or number of I/O
queue changes, but we do want to change the reconnect delay and
the controller loss timeout.
Signed-off-by: Hannes Reinecke <hare@suse.com>
---
Documentation/nvme-discover.txt | 13 ++++++++++++-
fabrics.c | 4 +---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
index 36a1a90..287ef17 100644
--- a/Documentation/nvme-discover.txt
+++ b/Documentation/nvme-discover.txt
@@ -14,7 +14,9 @@ SYNOPSIS
[--trsvcid=<trsvcid> | -s <trsvcid>]
[--host-traddr=<traddr> | -w <traddr>]
[--hostnqn=<hostnqn> | -q <hostnqn>]
- [--raw=<filename> | -r <filename>]
+ [--raw=<filename> | -r <filename>]
+ [--reconnect-delay=<#> | -c <#>]
+ [--ctrl-loss-tmo=<#> | -l <#>]
DESCRIPTION
-----------
@@ -99,6 +101,15 @@ OPTIONS
and dump it to a raw binary file. By default 'nvme discover' will
dump the output to stdout.
+-c <#>::
+--reconnect-delay=<#>::
+ Overrides the default delay (in seconds) before reconnect is attempted
+ after a connect loss.
+
+-l <#>::
+--ctrl-loss-tmo=<#>::
+ Overrides the default controller loss timeout period (in seconds).
+
EXAMPLES
--------
* Query the Discover Controller with IP4 address 192.168.1.3 for all
diff --git a/fabrics.c b/fabrics.c
index 391f75e..b64930d 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -815,12 +815,10 @@ int discover(const char *desc, int argc, char **argv, bool connect)
{"host-traddr", 'w', "LIST", CFG_STRING, &cfg.host_traddr, required_argument, "host traddr (e.g. FC WWN's)" },
{"hostnqn", 'q', "LIST", CFG_STRING, &cfg.hostnqn, required_argument, "user-defined hostnqn (if default not used)" },
{"hostid", 'I', "LIST", CFG_STRING, &cfg.hostid, required_argument, "user-defined hostid (if default not used)"},
- {"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" },
+ {"reconnect-delay", 'c', "LIST", CFG_STRING, &cfg.reconnect_delay, required_argument, "reconnect timeout period in seconds" },
{"ctrl-loss-tmo", 'l', "LIST", CFG_STRING, &cfg.ctrl_loss_tmo, required_argument, "controller loss timeout period in seconds" },
-
{NULL},
};
--
2.13.7
