multipath: cleanup dev_loss_tmo issues

There are a couple of issues with the dev_loss_tmo code.  First, the
comparison between fast_io_fail and dev_loss was failing for
fast_io_fail = -1. Second, if fast_io_fail_tmo was set to off, and
dev_loss was greater than 600, dev_loss_tmo would not be set. Finally,
verify_paths was calling sysfs_set_scsi_tmo without ever calling
select_fast_io_fail.  However, this hasn't be causing problems since
setup_map is always called immediately after verify_paths, and it calls
all the select_ functions correctly.  This patch fixes all these.  Now,
if setting dev_loss_tmo fails, and fast_io_fail is set to off, it will
retry will dev_loss_tmo set to 600. Also, the calls that are duplicated
between verify_paths and setup_map have been removed.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index b68c83b..736978c 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -299,17 +299,17 @@ sysfs_set_scsi_tmo (struct multipath *mpp)
                        no_path_retry_tmo = MAX_DEV_LOSS_TMO;
                if (no_path_retry_tmo > dev_loss_tmo)
                        dev_loss_tmo = no_path_retry_tmo;
-               condlog(3, "%s: update dev_loss_tmo to %d\n",
+               condlog(3, "%s: update dev_loss_tmo to %d",
                        mpp->alias, dev_loss_tmo);
        } else if (mpp->no_path_retry == NO_PATH_RETRY_QUEUE) {
                dev_loss_tmo = MAX_DEV_LOSS_TMO;
-               condlog(4, "%s: update dev_loss_tmo to %d\n",
+               condlog(3, "%s: update dev_loss_tmo to %d",
                        mpp->alias, dev_loss_tmo);
        }
        mpp->dev_loss = dev_loss_tmo;
-       if (mpp->fast_io_fail > mpp->dev_loss) {
+       if (mpp->fast_io_fail > (int)mpp->dev_loss) {
                mpp->fast_io_fail = mpp->dev_loss;
-               condlog(3, "%s: update fast_io_fail to %d\n",
+               condlog(3, "%s: update fast_io_fail to %d",
                        mpp->alias, mpp->fast_io_fail);
        }
        if (!mpp->dev_loss && !mpp->fast_io_fail)
@@ -333,9 +333,17 @@ sysfs_set_scsi_tmo (struct multipath *mpp)
                        snprintf(value, 11, "%u", mpp->dev_loss);
                        if (sysfs_attr_set_value(attr_path, "dev_loss_tmo",
                                                 value, 11) < 0) {
-                               condlog(0, "%s failed to set %s/dev_loss_tmo",
-                                       mpp->alias, attr_path);
-                               return 1;
+                               int err = 1;
+                               if (mpp->fast_io_fail <= 0 && mpp->dev_loss > 600) {
+                                       strncpy(value, "600", 4);
+                                       condlog(3, "%s: limiting dev_loss_tmo to 600, since fast_io_fail is not set", mpp->alias);
+                                       if (sysfs_attr_set_value(attr_path, "dev_loss_tmo", value, 11) >= 0)
+                                               err = 0;
+                               }
+                               if (err) {
+                                       condlog(0, "%s failed to set %s/dev_loss_tmo", mpp->alias, attr_path);
+                                       return 1;
+                               }
                        }
                }
                if (mpp->fast_io_fail){

diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
index b024e5b..f4bae10 100644 (file)
--- a/libmultipath/structs_vec.c
+++ b/libmultipath/structs_vec.c
@@ -441,11 +441,6 @@ verify_paths(struct multipath * mpp, struct vectors * vecs, vector rpvec)
        if (!mpp)
                return 0;
 
-       select_features(mpp);
-       select_no_path_retry(mpp);
-       select_dev_loss(mpp);
-       sysfs_set_scsi_tmo(mpp);
-
        vector_foreach_slot (mpp->paths, pp, i) {
                /*
                 * see if path is in sysfs