Refactor patches for iscsi-initiator-utils package

Use iscsi-initiator-utils-config package to package config and
service file for iscsi-initiator-utils package.

Deployment test and ping test between WMs pass
Config and service files check pass.

Story: 2003768
Task: 27596

Change-Id: I6512171f1c9186018c0af15b15e7d2094e3d7a73
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-11-18 01:41:44 +08:00 committed by zhipeng liu
parent 7725b83a95
commit 335a519863
13 changed files with 381 additions and 142 deletions

View File

@ -296,6 +296,7 @@ haproxy-config
# iscsi-initiator-utils # iscsi-initiator-utils
iscsi-initiator-utils iscsi-initiator-utils
iscsi-initiator-utils-iscsiuio iscsi-initiator-utils-iscsiuio
iscsi-initiator-utils-config
# iptables # iptables
iptables iptables

View File

@ -130,6 +130,7 @@ base/bash
base/haproxy base/haproxy
base/haproxy-config base/haproxy-config
filesystem/iscsi-initiator-utils filesystem/iscsi-initiator-utils
filesystem/iscsi-initiator-utils-config
ldap/ldapscripts ldap/ldapscripts
networking/net-tools networking/net-tools
filesystem/drbd/drbd-tools filesystem/drbd/drbd-tools

View File

@ -0,0 +1,2 @@
SRC_DIR="files"
TIS_PATCH_VER=0

View File

@ -0,0 +1,42 @@
Summary: iscsi-initiator-utils-config
Name: iscsi-initiator-utils-config
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
License: Apache-2.0
Group: base
Packager: StarlingX
URL: unknown
BuildArch: noarch
Source: %name-%version.tar.gz
Requires: iscsi-initiator-utils
Summary: package StarlingX configuration files of iscsi-initiator-utils to system folder.
%description
package StarlingX configuration files of iscsi-initiator-utils to system folder.
%prep
%setup
%build
%install
%{__install} -d %{buildroot}%{_tmpfilesdir}
%{__install} -d %{buildroot}%{_sysconfdir}/systemd/system
%{__install} -d %{buildroot}%{_datadir}/starlingx
%{__install} -m 0644 iscsi-cache.volatiles %{buildroot}%{_tmpfilesdir}/iscsi-cache.conf
%{__install} -m 0644 iscsi-shutdown.service %{buildroot}%{_sysconfdir}/systemd/system
%{__install} -m 0644 iscsid.conf %{buildroot}%{_datadir}/starlingx/stx.iscsid.conf
%post
if [ $1 -eq 1 ] ; then
# Initial installation
cp -f %{_datadir}/starlingx/stx.iscsid.conf %{_sysconfdir}/iscsi/iscsid.conf
fi
/bin/systemctl disable iscsi-shutdown.service
%files
%{_tmpfilesdir}/iscsi-cache.conf
%{_sysconfdir}/systemd/system/iscsi-shutdown.service
%{_datadir}/starlingx/stx.iscsid.conf

View File

@ -0,0 +1,16 @@
[Unit]
Description=Logout off all iSCSI sessions on shutdown
Documentation=man:iscsid(8) man:iscsiadm(8)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
After=network.service
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
RefuseManualStop=yes
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=-/bin/true
ExecStop=-/sbin/iscsiadm -m node --logoutall=all

View File

@ -0,0 +1,317 @@
#
# Open-iSCSI default configuration.
# Could be located at /etc/iscsi/iscsid.conf or ~/.iscsid.conf
#
# Note: To set any of these values for a specific node/session run
# the iscsiadm --mode node --op command for the value. See the README
# and man page for iscsiadm for details on the --op command.
#
######################
# iscsid daemon config
######################
# If you want iscsid to start the first time an iscsi tool
# needs to access it, instead of starting it when the init
# scripts run, set the iscsid startup command here. This
# should normally only need to be done by distro package
# maintainers.
#
# Default for Fedora and RHEL. (uncomment to activate).
# Use socket activation, but try to make sure the socket units are listening
iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
#
# Default for upstream open-iscsi scripts (uncomment to activate).
# iscsid.startup = /sbin/iscsid
# Check for active mounts on devices reachable through a session
# and refuse to logout if there are any. Defaults to "No".
# iscsid.safe_logout = Yes
#############################
# NIC/HBA and driver settings
#############################
# open-iscsi can create a session and bind it to a NIC/HBA.
# To set this up see the example iface config file.
#*****************
# Startup settings
#*****************
# To request that the iscsi initd scripts startup a session set to "automatic".
# node.startup = automatic
#
# To manually startup the session set to "manual". The default is automatic.
node.startup = automatic
# For "automatic" startup nodes, setting this to "Yes" will try logins on each
# available iface until one succeeds, and then stop. The default "No" will try
# logins on all available ifaces simultaneously.
node.leading_login = No
# *************
# CHAP Settings
# *************
# To enable CHAP authentication set node.session.auth.authmethod
# to CHAP. The default is None.
#node.session.auth.authmethod = CHAP
# To set a CHAP username and password for initiator
# authentication by the target(s), uncomment the following lines:
#node.session.auth.username = username
#node.session.auth.password = password
# To set a CHAP username and password for target(s)
# authentication by the initiator, uncomment the following lines:
#node.session.auth.username_in = username_in
#node.session.auth.password_in = password_in
# To enable CHAP authentication for a discovery session to the target
# set discovery.sendtargets.auth.authmethod to CHAP. The default is None.
#discovery.sendtargets.auth.authmethod = CHAP
# To set a discovery session CHAP username and password for the initiator
# authentication by the target(s), uncomment the following lines:
#discovery.sendtargets.auth.username = username
#discovery.sendtargets.auth.password = password
# To set a discovery session CHAP username and password for target(s)
# authentication by the initiator, uncomment the following lines:
#discovery.sendtargets.auth.username_in = username_in
#discovery.sendtargets.auth.password_in = password_in
# ********
# Timeouts
# ********
#
# See the iSCSI README's Advanced Configuration section for tips
# on setting timeouts when using multipath or doing root over iSCSI.
#
# To specify the length of time to wait for session re-establishment
# before failing SCSI commands back to the application when running
# the Linux SCSI Layer error handler, edit the line.
# The value is in seconds and the default is 120 seconds.
# Special values:
# - If the value is 0, IO will be failed immediately.
# - If the value is less than 0, IO will remain queued until the session
# is logged back in, or until the user runs the logout command.
node.session.timeo.replacement_timeout = 900
# To specify the time to wait for login to complete, edit the line.
# The value is in seconds and the default is 15 seconds.
node.conn[0].timeo.login_timeout = 15
# To specify the time to wait for logout to complete, edit the line.
# The value is in seconds and the default is 15 seconds.
node.conn[0].timeo.logout_timeout = 15
# Time interval to wait for on connection before sending a ping.
node.conn[0].timeo.noop_out_interval = 900
# To specify the time to wait for a Nop-out response before failing
# the connection, edit this line. Failing the connection will
# cause IO to be failed back to the SCSI layer. If using dm-multipath
# this will cause the IO to be failed to the multipath layer.
node.conn[0].timeo.noop_out_timeout = 900
# To specify the time to wait for abort response before
# failing the operation and trying a logical unit reset edit the line.
# The value is in seconds and the default is 15 seconds.
node.session.err_timeo.abort_timeout = 15
# To specify the time to wait for a logical unit response
# before failing the operation and trying session re-establishment
# edit the line.
# The value is in seconds and the default is 30 seconds.
node.session.err_timeo.lu_reset_timeout = 30
# To specify the time to wait for a target response
# before failing the operation and trying session re-establishment
# edit the line.
# The value is in seconds and the default is 30 seconds.
node.session.err_timeo.tgt_reset_timeout = 30
#******
# Retry
#******
# To specify the number of times iscsid should retry a login
# if the login attempt fails due to the node.conn[0].timeo.login_timeout
# expiring modify the following line. Note that if the login fails
# quickly (before node.conn[0].timeo.login_timeout fires) because the network
# layer or the target returns an error, iscsid may retry the login more than
# node.session.initial_login_retry_max times.
#
# This retry count along with node.conn[0].timeo.login_timeout
# determines the maximum amount of time iscsid will try to
# establish the initial login. node.session.initial_login_retry_max is
# multiplied by the node.conn[0].timeo.login_timeout to determine the
# maximum amount.
#
# The default node.session.initial_login_retry_max is 8 and
# node.conn[0].timeo.login_timeout is 15 so we have:
#
# node.conn[0].timeo.login_timeout * node.session.initial_login_retry_max =
# 120 seconds
#
# Valid values are any integer value. This only
# affects the initial login. Setting it to a high value can slow
# down the iscsi service startup. Setting it to a low value can
# cause a session to not get logged into, if there are distuptions
# during startup or if the network is not ready at that time.
node.session.initial_login_retry_max = 8
################################
# session and device queue depth
################################
# To control how many commands the session will queue set
# node.session.cmds_max to an integer between 2 and 2048 that is also
# a power of 2. The default is 128.
node.session.cmds_max = 128
# To control the device's queue depth set node.session.queue_depth
# to a value between 1 and 1024. The default is 32.
node.session.queue_depth = 32
##################################
# MISC SYSTEM PERFORMANCE SETTINGS
##################################
# For software iscsi (iscsi_tcp) and iser (ib_iser) each session
# has a thread used to transmit or queue data to the hardware. For
# cxgb3i you will get a thread per host.
#
# Setting the thread's priority to a lower value can lead to higher throughput
# and lower latencies. The lowest value is -20. Setting the priority to
# a higher value, can lead to reduced IO performance, but if you are seeing
# the iscsi or scsi threads dominate the use of the CPU then you may want
# to set this value higher.
#
# Note: For cxgb3i you must set all sessions to the same value, or the
# behavior is not defined.
#
# The default value is -20. The setting must be between -20 and 20.
node.session.xmit_thread_priority = -20
#***************
# iSCSI settings
#***************
# To enable R2T flow control (i.e., the initiator must wait for an R2T
# command before sending any data), uncomment the following line:
#
#node.session.iscsi.InitialR2T = Yes
#
# To disable R2T flow control (i.e., the initiator has an implied
# initial R2T of "FirstBurstLength" at offset 0), uncomment the following line:
#
# The defaults is No.
node.session.iscsi.InitialR2T = No
#
# To disable immediate data (i.e., the initiator does not send
# unsolicited data with the iSCSI command PDU), uncomment the following line:
#
#node.session.iscsi.ImmediateData = No
#
# To enable immediate data (i.e., the initiator sends unsolicited data
# with the iSCSI command packet), uncomment the following line:
#
# The default is Yes
node.session.iscsi.ImmediateData = Yes
# To specify the maximum number of unsolicited data bytes the initiator
# can send in an iSCSI PDU to a target, edit the following line.
#
# The value is the number of bytes in the range of 512 to (2^24-1) and
# the default is 262144
node.session.iscsi.FirstBurstLength = 262144
# To specify the maximum SCSI payload that the initiator will negotiate
# with the target for, edit the following line.
#
# The value is the number of bytes in the range of 512 to (2^24-1) and
# the defauls it 16776192
node.session.iscsi.MaxBurstLength = 16776192
# To specify the maximum number of data bytes the initiator can receive
# in an iSCSI PDU from a target, edit the following line.
#
# The value is the number of bytes in the range of 512 to (2^24-1) and
# the default is 262144
node.conn[0].iscsi.MaxRecvDataSegmentLength = 262144
# To specify the maximum number of data bytes the initiator will send
# in an iSCSI PDU to the target, edit the following line.
#
# The value is the number of bytes in the range of 512 to (2^24-1).
# Zero is a special case. If set to zero, the initiator will use
# the target's MaxRecvDataSegmentLength for the MaxXmitDataSegmentLength.
# The default is 0.
node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
# To specify the maximum number of data bytes the initiator can receive
# in an iSCSI PDU from a target during a discovery session, edit the
# following line.
#
# The value is the number of bytes in the range of 512 to (2^24-1) and
# the default is 32768
#
discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
# To allow the targets to control the setting of the digest checking,
# with the initiator requesting a preference of enabling the checking, uncomment
# the following lines (Data digests are not supported.):
#node.conn[0].iscsi.HeaderDigest = CRC32C,None
#
# To allow the targets to control the setting of the digest checking,
# with the initiator requesting a preference of disabling the checking,
# uncomment the following line:
#node.conn[0].iscsi.HeaderDigest = None,CRC32C
#
# To enable CRC32C digest checking for the header and/or data part of
# iSCSI PDUs, uncomment the following line:
#node.conn[0].iscsi.HeaderDigest = CRC32C
#
# To disable digest checking for the header and/or data part of
# iSCSI PDUs, uncomment the following line:
#node.conn[0].iscsi.HeaderDigest = None
#
# The default is to never use DataDigests or HeaderDigests.
#
node.conn[0].iscsi.HeaderDigest = None
# For multipath configurations, you may want more than one session to be
# created on each iface record. If node.session.nr_sessions is greater
# than 1, performing a 'login' for that node will ensure that the
# appropriate number of sessions is created.
node.session.nr_sessions = 1
#************
# Workarounds
#************
# Some targets like IET prefer after an initiator has sent a task
# management function like an ABORT TASK or LOGICAL UNIT RESET, that
# it does not respond to PDUs like R2Ts. To enable this behavior uncomment
# the following line (The default behavior is Yes):
node.session.iscsi.FastAbort = Yes
# Some targets like Equalogic prefer that after an initiator has sent
# a task management function like an ABORT TASK or LOGICAL UNIT RESET, that
# it continue to respond to R2Ts. To enable this uncomment this line
# node.session.iscsi.FastAbort = No
# To prevent doing automatic scans that would add unwanted luns to the system
# we can disable them and have sessions only do manually requested scans.
# Automatic scans are performed on startup, on login, and on AEN/AER reception
# on devices supporting it. For HW drivers all sessions will use the value
# defined in the configuration file. This configuration option is independent
# of scsi_mod scan parameter. (The default behavior is auto):
node.session.scan = auto

View File

@ -1,2 +1 @@
COPY_LIST="files/*" TIS_PATCH_VER=3
TIS_PATCH_VER=2

View File

@ -11,36 +11,6 @@ diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
index a7bd696..847f95c 100644 index a7bd696..847f95c 100644
--- a/SPECS/iscsi-initiator-utils.spec --- a/SPECS/iscsi-initiator-utils.spec
+++ b/SPECS/iscsi-initiator-utils.spec +++ b/SPECS/iscsi-initiator-utils.spec
@@ -13,6 +13,9 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{open_iscsi_version}.
Source4: 04-iscsi
Source5: iscsi-tmpfiles.conf
+# WRS
+Source6: iscsi-cache.volatiles
+
# upstream patches, post last tagged version
Patch1: open-iscsi-2.0.874-1-iBFT-origin-is-an-enum-not-a-string.patch
Patch2: open-iscsi-2.0.874-4-iscsid-treat-SIGTERM-like-iscsiadm-k-0.patch
@@ -55,6 +58,9 @@ Patch198: keep-open-isns.patch
# version string, needs to be updated with each build
Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+# WRS
+Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
+
BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
# For dir ownership
Requires: %{name}-iscsiuio >= %{version}-%{release}
@@ -168,6 +174,9 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
%{__install} -pm 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
$RPM_BUILD_ROOT%{python_sitearch}
+# WRS
+%{__install} -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi-cache.conf
+
%post
/sbin/ldconfig
@@ -232,13 +241,13 @@ fi @@ -232,13 +241,13 @@ fi
%files %files
@ -73,16 +43,6 @@ index a7bd696..847f95c 100644
%{_sbindir}/iscsi-iname %{_sbindir}/iscsi-iname
%{_sbindir}/iscsiadm %{_sbindir}/iscsiadm
%{_sbindir}/iscsid %{_sbindir}/iscsid
@@ -261,6 +270,9 @@ fi
%{_mandir}/man8/iscsid.8.gz
%{_mandir}/man8/iscsistart.8.gz
+# WRS
+%{_tmpfilesdir}/iscsi-cache.conf
+
%files iscsiuio
%{_sbindir}/iscsiuio
%{_unitdir}/iscsiuio.service
-- --
2.7.4 2.7.4

View File

@ -1,26 +0,0 @@
From 1a8a5cd52c489dc419653e24f9042f9dd87ce9bc Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 2 Nov 2017 11:03:43 -0400
Subject: [PATCH] Add iscsi-shutdown.service patch
---
SPECS/iscsi-initiator-utils.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
index 8865737..ce25ad4 100644
--- a/SPECS/iscsi-initiator-utils.spec
+++ b/SPECS/iscsi-initiator-utils.spec
@@ -59,7 +59,8 @@ Patch198: keep-open-isns.patch
Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
# WRS
-Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
+Patch10001: 0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
+Patch10002: 0002-Add-dependency-against-network.service-to-iscsi-shut.patch
BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
# For dir ownership
--
2.7.4

View File

@ -1,3 +1,3 @@
0001-spec-include-TiS-changes.patch 0001-spec-include-TiS-changes.patch
0002-Update-package-versioning-for-TIS-format.patch 0002-Update-package-versioning-for-TIS-format.patch
0003-Add-iscsi-shutdown.service-patch.patch

View File

@ -1,48 +0,0 @@
From e030a19da5a93a8fdca9ed1c7263d6e2be3ceb5a Mon Sep 17 00:00:00 2001
From: Chris Friesen <chris.friesen@windriver.com>
Date: Wed, 5 Aug 2015 18:09:36 -0400
Subject: [PATCH] Increase default error timeouts for iSCSI initiator
The only place we use the iSCSI initiator within our system is on
the compute nodes when using cinder volumes.
Accordingly, change the default values to something that makes more
sense when instance root filesystems are being accessed via iSCSI.
This addresses CGTS-2286.
---
etc/iscsid.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index b9b3b1f..0f270b5 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -95,7 +95,7 @@ node.leading_login = No
# - If the value is 0, IO will be failed immediately.
# - If the value is less than 0, IO will remain queued until the session
# is logged back in, or until the user runs the logout command.
-node.session.timeo.replacement_timeout = 120
+node.session.timeo.replacement_timeout = 900
# To specify the time to wait for login to complete, edit the line.
# The value is in seconds and the default is 15 seconds.
@@ -106,13 +106,13 @@ node.conn[0].timeo.login_timeout = 15
node.conn[0].timeo.logout_timeout = 15
# Time interval to wait for on connection before sending a ping.
-node.conn[0].timeo.noop_out_interval = 5
+node.conn[0].timeo.noop_out_interval = 900
# To specify the time to wait for a Nop-out response before failing
# the connection, edit this line. Failing the connection will
# cause IO to be failed back to the SCSI layer. If using dm-multipath
# this will cause the IO to be failed to the multipath layer.
-node.conn[0].timeo.noop_out_timeout = 5
+node.conn[0].timeo.noop_out_timeout = 900
# To specify the time to wait for abort response before
# failing the operation and trying a logical unit reset edit the line.
--
1.9.1

View File

@ -1,25 +0,0 @@
From f1f45f8028b8ef5804e0c9ff4d7dd5be6d21fdb4 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 2 Nov 2017 11:00:17 -0400
Subject: [PATCH] Add dependency against network.service to
iscsi-shutdown.service
---
etc/systemd/iscsi-shutdown.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
index fcb431a..35ee8ba 100644
--- a/etc/systemd/iscsi-shutdown.service
+++ b/etc/systemd/iscsi-shutdown.service
@@ -4,6 +4,7 @@ Documentation=man:iscsid(8) man:iscsiadm(8)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+After=network.service
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
RefuseManualStop=yes
--
1.8.3.1