Do not print error when rport is blocked
[multipath-tools/.git] / libmultipath / discovery.c
index f305aa7..558c2bd 100644 (file)
@@ -323,6 +323,7 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
        char value[11];
        char rport_id[32];
        unsigned long long tmo = 0;
+       int ret;
 
        sprintf(rport_id, "rport-%d:%d-%d",
                pp->sg_id.host_no, pp->sg_id.channel, pp->sg_id.transport_id);
@@ -352,15 +353,16 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
            mpp->fast_io_fail != MP_FAST_IO_FAIL_ZERO &&
            mpp->fast_io_fail != MP_FAST_IO_FAIL_OFF) {
                /* Check if we need to temporarily increase dev_loss_tmo */
-               if (sysfs_attr_get_value(rport_dev, "dev_loss_tmo",
-                                        value, 16) <= 0) {
+               ret = sysfs_attr_get_value(rport_dev, "dev_loss_tmo",
+                                          value, 16);
+               if (ret <= 0) {
                        condlog(0, "%s: failed to read dev_loss_tmo value, "
-                               "error %d", pp->dev, errno);
+                               "error %d", rport_id, -ret);
                        goto out;
                }
                if (sscanf(value, "%llu\n", &tmo) != 1) {
                        condlog(0, "%s: Cannot parse dev_loss_tmo "
-                               "attribute '%s'",pp->dev, value);
+                               "attribute '%s'", rport_id, value);
                        goto out;
                }
                if (mpp->fast_io_fail >= tmo) {
@@ -368,16 +370,21 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
                }
        } else if (mpp->dev_loss > 600) {
                condlog(3, "%s: limiting dev_loss_tmo to 600, since "
-                       "fast_io_fail is not set", pp->dev);
+                       "fast_io_fail is not set", rport_id);
                snprintf(value, 11, "%u", 600);
        } else {
                snprintf(value, 11, "%u", mpp->dev_loss);
        }
-       if (strlen(value) &&
-           sysfs_attr_set_value(rport_dev, "dev_loss_tmo", value, 11) <= 0) {
-               condlog(0, "%s failed to set dev_loss_tmo",
-                       mpp->alias);
-               goto out;
+       if (strlen(value)) {
+               ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo", value, 11);
+               if (ret <= 0) {
+                       if (ret == -EBUSY)
+                               condlog(3, "%s: rport blocked", rport_id);
+                       else
+                               condlog(0, "%s: failed to set dev_loss_tmo to %s, error %d",
+                                       rport_id, value, -ret);
+                       goto out;
+               }
        }
        if (mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) {
                if (mpp->fast_io_fail == MP_FAST_IO_FAIL_OFF)
@@ -386,18 +393,27 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
                        sprintf(value, "0");
                else
                        snprintf(value, 11, "%u", mpp->fast_io_fail);
-               if (sysfs_attr_set_value(rport_dev, "fast_io_fail_tmo",
-                                        value, 11) <= 0) {
-                       condlog(0, "%s failed to set fast_io_fail_tmo",
-                               mpp->alias);
+               ret = sysfs_attr_set_value(rport_dev, "fast_io_fail_tmo",
+                                          value, 11);
+               if (ret <= 0) {
+                       if (ret == -EBUSY)
+                               condlog(3, "%s: rport blocked", rport_id);
+                       else
+                               condlog(0, "%s: failed to set fast_io_fail_tmo to %s, error %d",
+                                       rport_id, value, -ret);
                }
        }
        if (tmo > 0) {
                snprintf(value, 11, "%u", mpp->dev_loss);
-               if (sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
-                                        value, 11) <= 0)
-                       condlog(0, "%s failed to set dev_loss_tmo",
-                               mpp->alias);
+               ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
+                                          value, 11);
+               if (ret <= 0) {
+                       if (ret == -EBUSY)
+                               condlog(3, "%s: rport blocked", rport_id);
+                       else
+                               condlog(0, "%s: failed to set dev_loss_tmo to %s, error %d",
+                                       rport_id, value, -ret);
+               }
        }
 out:
        udev_device_unref(rport_dev);