719f475042
Update Source to latest upstream commit
* previous patch 0001-libmultipath-dm_is_mpath-cleanup.patch is
included in this commit
Rename files
* Previous patches 0002-0009 are now patches 0006-0013
Add 0001-BZ-1668693-disable-user_friendly_names-for-NetApp.patch
Add 0002-libmultipath-handle-existing-paths-in-marginal_path-.patch
Add 0003-multipathd-cleanup-marginal-paths-checking-timers.patch
Add 0004-libmultipath-fix-marginal-paths-queueing-errors.patch
Add 0005-libmultipath-fix-marginal_paths-nr_active-check.patch
* The above 5 patches have been submitted upstream
Add 0014-RH-Fix-nvme-compilation-warning.patch
* This change is only necessary because of Red Hat compilation
differences.
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 25 Jan 2019 17:09:42 -0600
|
|
Subject: [PATCH] multipathd: cleanup marginal paths checking timers
|
|
|
|
When a path gets recovered in hit_io_err_recheck_time(), it will
|
|
continue running in check_path(), so there is no reason to schedule
|
|
another path check as soon as possible (since one is currently
|
|
happening).
|
|
|
|
Also, there isn't much point in restarting the io err stat checking when
|
|
the path is down, so hit_io_err_recheck_time() should only be run when
|
|
the path is up. Downed marginal paths can be treated just like any other
|
|
downed path.
|
|
|
|
Finally, there is no reason to set reset pp->io_err_dis_reinstate_time
|
|
when we decide to enqueue a path. Either th enqueue will fail and the
|
|
path will get recovered, or it will succeed, and we won't check the
|
|
reinstate time again until poll_io_err_stat() marks the path as needing
|
|
a requeue.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/io_err_stat.c | 8 --------
|
|
multipathd/main.c | 3 ++-
|
|
2 files changed, 2 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/libmultipath/io_err_stat.c b/libmultipath/io_err_stat.c
|
|
index 1cb3ffe..416e13a 100644
|
|
--- a/libmultipath/io_err_stat.c
|
|
+++ b/libmultipath/io_err_stat.c
|
|
@@ -400,13 +400,6 @@ int hit_io_err_recheck_time(struct path *pp)
|
|
io_err_stat_log(4, "%s: reschedule checking after %d seconds",
|
|
pp->dev,
|
|
pp->mpp->marginal_path_err_recheck_gap_time);
|
|
- /*
|
|
- * to reschedule io error checking again
|
|
- * if the path is good enough, we claim it is good
|
|
- * and can be reinsated as soon as possible in the
|
|
- * check_path routine.
|
|
- */
|
|
- pp->io_err_dis_reinstate_time = curr_time.tv_sec;
|
|
r = enqueue_io_err_stat_by_path(pp);
|
|
/*
|
|
* Enqueue fails because of internal error.
|
|
@@ -426,7 +419,6 @@ int hit_io_err_recheck_time(struct path *pp)
|
|
recover:
|
|
pp->io_err_pathfail_cnt = 0;
|
|
pp->io_err_disable_reinstate = 0;
|
|
- pp->tick = 1;
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 491832b..cac9050 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -2075,7 +2075,8 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
|
|
return 1;
|
|
}
|
|
|
|
- if (pp->io_err_disable_reinstate && hit_io_err_recheck_time(pp)) {
|
|
+ if ((newstate == PATH_UP || newstate == PATH_GHOST) &&
|
|
+ pp->io_err_disable_reinstate && hit_io_err_recheck_time(pp)) {
|
|
pp->state = PATH_SHAKY;
|
|
/*
|
|
* to reschedule as soon as possible,so that this path can
|
|
--
|
|
2.17.2
|
|
|