diff options
| author | Benjamin Marzinski <bmarzins@redhat.com> | 2018-02-15 13:17:53 -0600 |
|---|---|---|
| committer | Benjamin Marzinski <bmarzins@redhat.com> | 2018-02-15 13:17:53 -0600 |
| commit | 5bea53fe7ed7dd7afa8e76f7f84f76fdb89d59d9 (patch) | |
| tree | 9a89c87df6336311ebe30ae2c51af13f92d6a3d6 /0002-multipath-fix-DEF_TIMEOUT-use.patch | |
| parent | 7e8f34e1813a9ae89b5acc012fa7d45c3d7bbdb8 (diff) | |
| download | device-mapper-multipath-master.tar.gz device-mapper-multipath-master.tar.xz device-mapper-multipath-master.zip | |
device-mapper-multipath-0.7.4-1.git07e7bd5master
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
Diffstat (limited to '0002-multipath-fix-DEF_TIMEOUT-use.patch')
| -rw-r--r-- | 0002-multipath-fix-DEF_TIMEOUT-use.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/0002-multipath-fix-DEF_TIMEOUT-use.patch b/0002-multipath-fix-DEF_TIMEOUT-use.patch new file mode 100644 index 0000000..9df8ceb --- /dev/null +++ b/0002-multipath-fix-DEF_TIMEOUT-use.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski <bmarzins@redhat.com> +Date: Thu, 18 Jan 2018 13:13:54 -0600 +Subject: [PATCH] multipath: fix DEF_TIMEOUT use + +DEF_TIMEOUT is specified in seconds. The io_hdr timeout is specified in +milliseconds, so we need to convert it. Multipath should be waiting +longer than 30 milliseconds here. If there are concerns that 30 seconds +may be too long, we could always make this configurable, using +conf->checker_timeout if set. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> +--- + libmultipath/discovery.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c +index 4b31dde..f118800 100644 +--- a/libmultipath/discovery.c ++++ b/libmultipath/discovery.c +@@ -766,7 +766,7 @@ do_inq(int sg_fd, int cmddt, int evpd, unsigned int pg_op, + io_hdr.dxferp = resp; + io_hdr.cmdp = inqCmdBlk; + io_hdr.sbp = sense_b; +- io_hdr.timeout = DEF_TIMEOUT; ++ io_hdr.timeout = DEF_TIMEOUT * 1000; + + if (ioctl(sg_fd, SG_IO, &io_hdr) < 0) + return -1; +-- +2.7.4 + |