|
 |
569cde1 |
From 76cdf1d071442a6dec34c59a2c32397e58691757 Mon Sep 17 00:00:00 2001
|
|
|
569cde1 |
From: Chris Leech <cleech@redhat.com>
|
|
|
569cde1 |
Date: Thu, 16 Feb 2017 11:09:54 -0800
|
|
|
569cde1 |
Subject: [PATCH 1/1] fix timeout setting on discoverydb commands
|
|
|
569cde1 |
|
|
|
569cde1 |
---
|
|
|
569cde1 |
usr/idbm.c | 2 ++
|
|
|
569cde1 |
usr/iscsiadm.c | 1 +
|
|
|
569cde1 |
2 files changed, 3 insertions(+)
|
|
|
569cde1 |
|
|
|
569cde1 |
diff --git a/usr/idbm.c b/usr/idbm.c
|
|
|
569cde1 |
index 3b8a5a2..eb46e94 100644
|
|
|
569cde1 |
--- a/usr/idbm.c
|
|
|
569cde1 |
+++ b/usr/idbm.c
|
|
|
569cde1 |
@@ -914,6 +914,7 @@ idbm_discovery_setup_defaults(discovery_rec_t *rec, discovery_type_e type)
|
|
|
569cde1 |
|
|
|
569cde1 |
rec->startup = ISCSI_STARTUP_MANUAL;
|
|
|
569cde1 |
rec->type = type;
|
|
|
569cde1 |
+ rec->iscsid_req_tmo = -1;
|
|
|
569cde1 |
switch (type) {
|
|
|
569cde1 |
case DISCOVERY_TYPE_SENDTARGETS:
|
|
|
569cde1 |
rec->u.sendtargets.discoveryd_poll_inval = 30;
|
|
|
569cde1 |
@@ -1914,6 +1915,7 @@ idbm_discovery_read(discovery_rec_t *out_rec, int drec_type,
|
|
|
569cde1 |
return ISCSI_ERR_INVAL;
|
|
|
569cde1 |
|
|
|
569cde1 |
memset(out_rec, 0, sizeof(discovery_rec_t));
|
|
|
569cde1 |
+ out_rec->iscsid_req_tmo = -1;
|
|
|
569cde1 |
|
|
|
569cde1 |
info = idbm_recinfo_alloc(MAX_KEYS);
|
|
|
569cde1 |
if (!info)
|
|
|
569cde1 |
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
|
|
|
569cde1 |
index 4b2bd34..5818596 100644
|
|
|
569cde1 |
--- a/usr/iscsiadm.c
|
|
|
569cde1 |
+++ b/usr/iscsiadm.c
|
|
|
569cde1 |
@@ -2860,6 +2860,7 @@ static int exec_disc2_op(int disc_type, char *ip, int port,
|
|
|
569cde1 |
int rc = 0;
|
|
|
569cde1 |
|
|
|
569cde1 |
memset(&drec, 0, sizeof(struct discovery_rec));
|
|
|
569cde1 |
+ drec.iscsid_req_tmo = -1;
|
|
|
569cde1 |
if (disc_type != -1)
|
|
|
569cde1 |
drec.type = disc_type;
|
|
|
569cde1 |
|
|
|
569cde1 |
--
|
|
|
569cde1 |
1.8.3.1
|
|
|
569cde1 |
|