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
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 27 Jul 2018 11:25:23 -0500
|
|
Subject: [PATCH] libmultipath: fix tur checker timeout issue
|
|
|
|
If the tur checker is run, and the tur_thread has timed out,
|
|
libcheck_check() doesn't actually check if the thread is still running.
|
|
This means that the thread could have already completed successfully,
|
|
but the tur checker would still return PATH_TIMEOUT, instead of the
|
|
value returned by the thread. This patch makes libcheck_check() actually
|
|
check if the thread completed, and if so, it returns the proper value.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/checkers/tur.c | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
|
|
index 9f6ef51..4e2c7a8 100644
|
|
--- a/libmultipath/checkers/tur.c
|
|
+++ b/libmultipath/checkers/tur.c
|
|
@@ -276,12 +276,19 @@ int libcheck_check(struct checker * c)
|
|
if (ct->thread) {
|
|
if (tur_check_async_timeout(c)) {
|
|
int running = uatomic_xchg(&ct->running, 0);
|
|
- if (running)
|
|
+ if (running) {
|
|
pthread_cancel(ct->thread);
|
|
- condlog(3, "%s: tur checker timeout", ct->devt);
|
|
+ condlog(3, "%s: tur checker timeout", ct->devt);
|
|
+ MSG(c, MSG_TUR_TIMEOUT);
|
|
+ tur_status = PATH_TIMEOUT;
|
|
+ } else {
|
|
+ pthread_mutex_lock(&ct->lock);
|
|
+ tur_status = ct->state;
|
|
+ strlcpy(c->message, ct->message,
|
|
+ sizeof(c->message));
|
|
+ pthread_mutex_unlock(&ct->lock);
|
|
+ }
|
|
ct->thread = 0;
|
|
- MSG(c, MSG_TUR_TIMEOUT);
|
|
- tur_status = PATH_TIMEOUT;
|
|
} else if (uatomic_read(&ct->running) != 0) {
|
|
condlog(3, "%s: tur checker not finished", ct->devt);
|
|
tur_status = PATH_PENDING;
|
|
--
|
|
2.7.4
|
|
|