modify initial login retry max

Now the retry count only controls the number of retries
that we attempt when the initial login attempt timesout.
It used to control the retry count for any error, which resulted
in it having to be set really high and it was also difficult to
figure out what to set it to since users (and me) have no idea
how quickly the network layer will return errors in some cases.

The retry count is also used to determine the max amount of time
to wait for the initial login attempt. We do this by:

login retry max * login timeout = max time

This makes it easier for the user to calculate the
max time that they will have to wait.

The default time to wait is now 2 minutes for normal sessions and
7 minutes for root.

1 files changed, 18 insertions, 4 deletions

diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index 40027d6..4f6e08a 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -107,10 +107,24 @@ node.session.err_timeo.lu_reset_timeout = 20
 # Retry
 #******
 
-# To speficy the number of times iscsiadm should retry a login
-# to the target when we first login, modify the following line.
-# The default is 8. Note that after each attempt iscsid will
-# sleep 3 second.
+# 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