5bea53fe7e
Update Source to the latest upstream commit
* Previous patches 0001-0006 are included in this commit
* Previous patches 0007-0014 are now patches 0015-0022
Add 0001-libmultipath-fix-tur-checker-locking.patch
* Fixed spinlock bug. posted upstream
Add 0002-multipath-fix-DEF_TIMEOUT-use.patch
* Add missing sec to ms conversion. posted upstream
Add 0003-multipathd-remove-coalesce_paths-from-ev_add_map.patch
* Remove unused code. posted upstream
Add 0004-multipathd-remove-unused-configure-parameter.patch
* Remove unused code. posted upstream
Add 0005-Fix-set_no_path_retry-regression.patch
* Fix issue with queueing and path addition. posted upstream
Add 0006-multipathd-change-spurious-uevent-msg-priority.patch
* Change message priority to Notice. posted upstream
Add 0007-multipath-print-sysfs-state-in-fast-list-mode.patch
* Show sysfs state correctly in fast list mode (-l). posted upstream
Add 0008-libmultipath-move-remove_map-waiter-code-to-multipat.patch
* Move code around. posted upstream
Add 0009-move-waiter-code-from-libmultipath-to-multipathd.patch
* Move code around. posted upstream
Add 0010-call-start_waiter_thread-before-setup_multipath.patch
* Fix race on multipath device creations. posted upstream
Add 0011-libmultipath-add-helper-functions.patch
* posted upstream
Add 0012-multipathd-RFC-add-new-polling-dmevents-waiter-threa.patch
* Add alternate method of getting dmevents, that doesn't
require a thread per device. posted upstream
Add 0013-libmultipath-condlog-log-to-stderr.patch
* change condlog to log to stderr instead of stdout. posted upstream
Add 0014-multipathd-fix-compiler-warning-for-uev_pathfail_che.patch
* fix indentation issue. posted upstream
82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 6 Feb 2018 20:53:17 -0600
|
|
Subject: [PATCH] Fix set_no_path_retry() regression
|
|
|
|
commit 0f850db7fceb6b2bf4968f3831efd250c17c6138 "multipathd: clean up
|
|
set_no_path_retry" has a bug in it. It made set_no_path_retry
|
|
never reset mpp->retry_ticks, even if the device was in recovery mode,
|
|
and there were valid paths. This meant that adding new paths didn't
|
|
remove a device from recovery mode, and queueing could get disabled,
|
|
even while there were valid paths. This patch fixes that.
|
|
|
|
This patch also fixes a bug in cli_restore_queueing() and
|
|
cli_restore_all_queueing(), where a device that had no_path_retry
|
|
set to "queue" would enter recovery mode (although queueing would
|
|
never actually get disabled).
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/structs_vec.c | 5 +++--
|
|
multipathd/cli_handlers.c | 20 ++++++++++++--------
|
|
2 files changed, 15 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
|
|
index fbab61f..0de2221 100644
|
|
--- a/libmultipath/structs_vec.c
|
|
+++ b/libmultipath/structs_vec.c
|
|
@@ -343,9 +343,10 @@ static void set_no_path_retry(struct multipath *mpp)
|
|
dm_queue_if_no_path(mpp->alias, 1);
|
|
break;
|
|
default:
|
|
- if (mpp->nr_active > 0)
|
|
+ if (mpp->nr_active > 0) {
|
|
+ mpp->retry_tick = 0;
|
|
dm_queue_if_no_path(mpp->alias, 1);
|
|
- else if (is_queueing && mpp->retry_tick == 0)
|
|
+ } else if (is_queueing && mpp->retry_tick == 0)
|
|
enter_recovery_mode(mpp);
|
|
break;
|
|
}
|
|
diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
|
|
index 7f13bc9..80519b1 100644
|
|
--- a/multipathd/cli_handlers.c
|
|
+++ b/multipathd/cli_handlers.c
|
|
@@ -995,10 +995,12 @@ cli_restore_queueing(void *v, char **reply, int *len, void *data)
|
|
if (mpp->no_path_retry != NO_PATH_RETRY_UNDEF &&
|
|
mpp->no_path_retry != NO_PATH_RETRY_FAIL) {
|
|
dm_queue_if_no_path(mpp->alias, 1);
|
|
- if (mpp->nr_active > 0)
|
|
- mpp->retry_tick = 0;
|
|
- else
|
|
- enter_recovery_mode(mpp);
|
|
+ if (mpp->no_path_retry > 0) {
|
|
+ if (mpp->nr_active > 0)
|
|
+ mpp->retry_tick = 0;
|
|
+ else
|
|
+ enter_recovery_mode(mpp);
|
|
+ }
|
|
}
|
|
return 0;
|
|
}
|
|
@@ -1019,10 +1021,12 @@ cli_restore_all_queueing(void *v, char **reply, int *len, void *data)
|
|
if (mpp->no_path_retry != NO_PATH_RETRY_UNDEF &&
|
|
mpp->no_path_retry != NO_PATH_RETRY_FAIL) {
|
|
dm_queue_if_no_path(mpp->alias, 1);
|
|
- if (mpp->nr_active > 0)
|
|
- mpp->retry_tick = 0;
|
|
- else
|
|
- enter_recovery_mode(mpp);
|
|
+ if (mpp->no_path_retry > 0) {
|
|
+ if (mpp->nr_active > 0)
|
|
+ mpp->retry_tick = 0;
|
|
+ else
|
|
+ enter_recovery_mode(mpp);
|
|
+ }
|
|
}
|
|
}
|
|
return 0;
|
|
--
|
|
2.7.4
|
|
|