diff options
| author | Lee Duncan <lduncan@suse.com> | 2018-10-11 10:31:25 -0700 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2018-10-11 10:31:25 -0700 |
| commit | 1185b00c624851afdd01d9cae808253e952114af (patch) | |
| tree | d1462b2bedf9266e26f324a964899dc4779542ad | |
| parent | c274fdebcdf7119d2c41336181b17c094f30e6e2 (diff) | |
| download | open-iscsi-1185b00c624851afdd01d9cae808253e952114af.tar.gz | |
Make reconnect to session on startup forever default.
The daemon has traditionally tried to recover stale
sessions, at startup, in serial and in a forked process.
A recent commit, b9afe4709900, added the ability to limit
these retries, and it made the default 32. Commit
467946a945cc added back in the ability to retry forever,
if the retry count was set to 0, but left the default
at 32. This commit changes the default to 0, so as
not to disrupt the expected reconnection behavior by
default.
| -rw-r--r-- | etc/iscsid.conf | 16 | ||||
| -rw-r--r-- | libopeniscsiusr/default.h | 2 | ||||
| -rw-r--r-- | usr/iscsi_settings.h | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/etc/iscsid.conf b/etc/iscsid.conf index 00ce546..70985af 100644 --- a/etc/iscsid.conf +++ b/etc/iscsid.conf @@ -293,12 +293,16 @@ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768 # appropriate number of sessions is created. node.session.nr_sessions = 1 -# When iscsid starts up it recovers existing sesssions, if possible. -# If the target for a session has gone away when this occurs, this -# configuration value limits the number of retries to re-login, which -# are done every 2 seconds. A value of 0 implies to retry forever, -# which is not recommended. -node.session.reopen_max = 32 +# When iscsid starts up it recovers existing sessions, if possible. +# If the target for a session has gone away when this occurs, the +# iscsid daemon normally tries to reestablish each session, +# in succession, in the background, by trying again every two +# seconds, until all sessions are restored. This configuration +# variable can limits the number of retries for each session. +# For example, setting reopen_max=150 would mean that each session +# recovery was limited to about five minutes. +# +node.session.reopen_max = 0 #************ # Workarounds diff --git a/libopeniscsiusr/default.h b/libopeniscsiusr/default.h index 1ab951c..ba49bf1 100644 --- a/libopeniscsiusr/default.h +++ b/libopeniscsiusr/default.h @@ -55,7 +55,7 @@ #define DEF_HOST_RESET_TIMEO 60 /* session reopen max retries */ -#define DEF_SESSION_REOPEN_MAX 32 +#define DEF_SESSION_REOPEN_MAX 0 /* default window size */ #define TCP_WINDOW_SIZE (512 * 1024) diff --git a/usr/iscsi_settings.h b/usr/iscsi_settings.h index da2bdf9..a4e54a9 100644 --- a/usr/iscsi_settings.h +++ b/usr/iscsi_settings.h @@ -15,7 +15,7 @@ #define DEF_HOST_RESET_TIMEO 60 /* session reopen max retries */ -#define DEF_SESSION_REOPEN_MAX 32 +#define DEF_SESSION_REOPEN_MAX 0 /* q depths */ #define CMDS_MAX 128 |