From 569cde1fc941cf60072a7cd78aa63b950f58fb02 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Feb 20 2017 21:36:20 +0000 Subject: fix regression with iscsiadm discoverydb commands having a 0 timeout --- diff --git a/0023-fix-discoverydb-command-timeout.patch b/0023-fix-discoverydb-command-timeout.patch new file mode 100644 index 0000000..4bd3d18 --- /dev/null +++ b/0023-fix-discoverydb-command-timeout.patch @@ -0,0 +1,45 @@ +From 76cdf1d071442a6dec34c59a2c32397e58691757 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Thu, 16 Feb 2017 11:09:54 -0800 +Subject: [PATCH 1/1] fix timeout setting on discoverydb commands + +--- + usr/idbm.c | 2 ++ + usr/iscsiadm.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 3b8a5a2..eb46e94 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -914,6 +914,7 @@ idbm_discovery_setup_defaults(discovery_rec_t *rec, discovery_type_e type) + + rec->startup = ISCSI_STARTUP_MANUAL; + rec->type = type; ++ rec->iscsid_req_tmo = -1; + switch (type) { + case DISCOVERY_TYPE_SENDTARGETS: + rec->u.sendtargets.discoveryd_poll_inval = 30; +@@ -1914,6 +1915,7 @@ idbm_discovery_read(discovery_rec_t *out_rec, int drec_type, + return ISCSI_ERR_INVAL; + + memset(out_rec, 0, sizeof(discovery_rec_t)); ++ out_rec->iscsid_req_tmo = -1; + + info = idbm_recinfo_alloc(MAX_KEYS); + if (!info) +diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c +index 4b2bd34..5818596 100644 +--- a/usr/iscsiadm.c ++++ b/usr/iscsiadm.c +@@ -2860,6 +2860,7 @@ static int exec_disc2_op(int disc_type, char *ip, int port, + int rc = 0; + + memset(&drec, 0, sizeof(struct discovery_rec)); ++ drec.iscsid_req_tmo = -1; + if (disc_type != -1) + drec.type = disc_type; + +-- +1.8.3.1 + diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 9ea54c5..db76be8 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -6,7 +6,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -36,6 +36,7 @@ Patch0019: 0019-make-session-shutdown-a-seperate-service.patch.patch Patch0020: 0020-Add-macros-to-release-GIL-lock.patch Patch0021: 0021-libiscsi-introduce-sessions-API.patch Patch0022: 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch +Patch0023: 0023-fix-discoverydb-command-timeout.patch BuildRequires: flex bison python2-devel python3-devel python-setuptools doxygen kmod-devel systemd-units BuildRequires: autoconf automake libtool libmount-devel openssl-devel @@ -277,6 +278,9 @@ fi %{python3_sitearch}/* %changelog +* Thu Feb 16 2017 Chris Leech - 6.2.0.874-2.git86e8892 +- fix regression with iscsiadm discoverydb commands having a 0 timeout + * Thu Feb 09 2017 Chris Leech - 6.2.0.874-1 - update to 2.0.874