3ec0ebefcd
- Update Source to latest upstream commit
* Previous patches 0001-0011 are included in this commit
- Rename files
* Previous patches 0012-0019 are now patches 0021-0028
- Add 0001-libmultipath-fix-tur-checker-timeout.patch
- Add 0002-libmultipath-fix-tur-checker-double-locking.patch
- Add 0003-libmultipath-fix-tur-memory-misuse.patch
- Add 0004-libmultipath-cleanup-tur-locking.patch
- Add 0005-libmultipath-fix-tur-checker-timeout-issue.patch
* The above 5 patches cleanup locking issues with the
tur checker threads
- Add 0006-libmultipath-fix-set_int-error-path.patch
- Add 0007-libmultipath-fix-length-issues-in-get_vpd_sgio.patch
- Add 0008-libmultipath-_install_keyword-cleanup.patch
- Add 0009-libmultipath-remove-unused-code.patch
- Add 0010-libmultipath-fix-memory-issue-in-path_latency-prio.patch
- Add 0011-libmultipath-fix-null-dereference-int-alloc_path_gro.patch
- Add 0012-libmutipath-don-t-use-malformed-uevents.patch
- Add 0013-multipath-fix-max-array-size-in-print_cmd_valid.patch
- Add 0014-multipathd-function-return-value-tweaks.patch
- Add 0015-multipathd-minor-fixes.patch
- Add 0016-multipathd-remove-useless-check-and-fix-format.patch
- Add 0017-multipathd-fix-memory-leak-on-error-in-configure.patch
* The above 12 patches fix minor issues found by coverity
- Add 0018-libmultipath-Don-t-blank-intialized-paths.patch
- Add 0019-libmultipath-Fixup-updating-paths.patch
* Fix issues with paths whose wwid was not set or later changes
- Add 0020-multipath-tweak-logging-style.patch
* multipathd interactive commands now send errors to stderr, instead
of syslog
* The above 20 patches have been submitted upstream
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Thu, 26 Jul 2018 12:29:30 -0500
|
|
Subject: [PATCH] libmultipath: fix tur checker timeout
|
|
|
|
The code previously was timing out mode if ct->thread was 0 but
|
|
ct->running wasn't. This combination never happens. The idea was to
|
|
timeout if for some reason the path checker tried to kill the thread,
|
|
but it didn't die. The correct thing to check for this is ct->holders.
|
|
ct->holders will always be at least one when libcheck_check() is called,
|
|
since libcheck_free() won't get called until the device is no longer
|
|
being checked. So, if ct->holders is 2, that means that the tur thread
|
|
is has not shut down yet.
|
|
|
|
Also, instead of returning PATH_TIMEOUT whenever the thread hasn't died,
|
|
it should only time out if the thread didn't successfully get a value,
|
|
which means the previous state was already PATH_TIMEOUT.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/checkers/tur.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
|
|
index bf8486d..275541f 100644
|
|
--- a/libmultipath/checkers/tur.c
|
|
+++ b/libmultipath/checkers/tur.c
|
|
@@ -355,12 +355,15 @@ int libcheck_check(struct checker * c)
|
|
}
|
|
pthread_mutex_unlock(&ct->lock);
|
|
} else {
|
|
- if (uatomic_read(&ct->running) != 0) {
|
|
- /* pthread cancel failed. continue in sync mode */
|
|
- pthread_mutex_unlock(&ct->lock);
|
|
- condlog(3, "%s: tur thread not responding",
|
|
- tur_devt(devt, sizeof(devt), ct));
|
|
- return PATH_TIMEOUT;
|
|
+ if (uatomic_read(&ct->holders) > 1) {
|
|
+ /* pthread cancel failed. If it didn't get the path
|
|
+ state already, timeout */
|
|
+ if (ct->state == PATH_PENDING) {
|
|
+ pthread_mutex_unlock(&ct->lock);
|
|
+ condlog(3, "%s: tur thread not responding",
|
|
+ tur_devt(devt, sizeof(devt), ct));
|
|
+ return PATH_TIMEOUT;
|
|
+ }
|
|
}
|
|
/* Start new TUR checker */
|
|
ct->state = PATH_UNCHECKED;
|
|
--
|
|
2.7.4
|
|
|