efd38c93e9
Modify multipath.conf
* remove getuid_callout example
Re-add 0050-RH-listing-speedup.patch
Add 0081-RHBZ-1066264-check-prefix-on-rename.patch
* make multipath check the prefix on kpartx partitions during rename, and
copy the existing behaviour
Add 0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch
* If async tur checker fails on threads, don't retry with the sync version
Add 0083-RHBZ-1080055-orphan-paths-on-reload.patch
* Fix case where pathlist wasn't getting updated properly
Add 0084-RHBZ-1110000-multipath-man.patch
* fix errors in multipath man page
Add 0085-UPBZ-1110006-datacore-config.patch
* Add support for DataCore Virtual Disk
Add 0086-RHBZ-1110007-orphan-path-on-failed-add.patch
* If multipathd fails to add path correctly, it now fully orphans the path
Add 0087-RHBZ-1110013-config-error-checking.patch
* Improve multipath.conf error checking.
Add 0088-RHBZ-1069811-configurable-prio-timeout.patch
* checker_timeout now adjusts the timeouts of the prioritizers as well.
Add 0089-RHBZ-1110016-add-noasync-option.patch
* Add a new defaults option, "force_sync", that disables the async mode
of the path checkers. This is for cases where to many parallel checkers
hog the cpu
Add 0090-UPBZ-1080038-reorder-paths-for-round-robin.patch
* make multipathd order paths for better throughput in round-robin mode
Add 0091-RHBZ-1069584-fix-empty-values-fast-io-fail-and-dev-loss.patch
* check for null pointers in configuration reading code.
Add 0092-UPBZ-1104605-reload-on-rename.patch
* Reload table on rename if necessary
Add 0093-UPBZ-1086825-user-friendly-name-remap.patch
* Keep existing user_friend_name if possible
Add 0094-RHBZ-1086825-cleanup-remap.patch
* Cleanup issues with upstream patch
Add 0095-RHBZ-1127944-xtremIO-config.patch
* Add support for EMC ExtremIO devices
Add 0096-RHBZ-979474-new-wildcards.patch
* Add N, n, R, and r path wildcards to print World Wide ids
Add 0097-RH-fix-coverity-errors.patch
* Fix a number of unterminated strings and memory leaks on failure
paths.
Add 0098-UPBZ-1067171-mutipath-i.patch
* Add -i option to ignore wwids file when checking for valid paths
Add 0099-RH-add-all-devs.patch
* Add new devices config option all_devs. This makes the configuration
overwrite the specified values in all builtin configs
Add 0100-RHBZ-1067171-multipath-i-update.patch
* make -i work correctly with find_multipaths
Add 0101-RH-adapter-name-wildcard.patch
* Add 'a' path wildcard to print adapter name
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
---
|
|
multipath/main.c | 25 ++++++++++++++++++++++++-
|
|
1 file changed, 24 insertions(+), 1 deletion(-)
|
|
|
|
Index: multipath-tools-130222/multipath/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/main.c
|
|
+++ multipath-tools-130222/multipath/main.c
|
|
@@ -198,6 +198,9 @@ get_dm_mpvec (vector curmp, vector pathv
|
|
continue;
|
|
}
|
|
|
|
+ if (conf->cmd == CMD_VALID_PATH)
|
|
+ continue;
|
|
+
|
|
dm_get_map(mpp->alias, &mpp->size, params);
|
|
condlog(3, "params = %s", params);
|
|
dm_get_status(mpp->alias, status);
|
|
@@ -308,7 +311,13 @@ configure (void)
|
|
goto out;
|
|
}
|
|
condlog(3, "scope limited to %s", refwwid);
|
|
- if (conf->cmd == CMD_VALID_PATH) {
|
|
+ /* If you are ignoring the wwids file and find_multipaths is
|
|
+ * set, you need to actually check if there are two available
|
|
+ * paths to determine if this path should be multipathed. To
|
|
+ * do this, we put off the check until after discovering all
|
|
+ * the paths */
|
|
+ if (conf->cmd == CMD_VALID_PATH &&
|
|
+ (!conf->find_multipaths || !conf->ignore_wwids)) {
|
|
if (conf->ignore_wwids ||
|
|
check_wwids_file(refwwid, 0) == 0)
|
|
r = 0;
|
|
@@ -348,6 +357,20 @@ configure (void)
|
|
|
|
filter_pathvec(pathvec, refwwid);
|
|
|
|
+
|
|
+ if (conf->cmd == CMD_VALID_PATH) {
|
|
+ /* This only happens if find_multipaths is and
|
|
+ * ignore_wwids is set.
|
|
+ * If there is currently a multipath device matching
|
|
+ * the refwwid, or there is more than one path matching
|
|
+ * the refwwid, then the path is valid */
|
|
+ if (VECTOR_SIZE(curmp) != 0 || VECTOR_SIZE(pathvec) > 1)
|
|
+ r = 0;
|
|
+ printf("%s %s a valid multipath device path\n",
|
|
+ conf->dev, r == 0 ? "is" : "is not");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
if (conf->cmd != CMD_CREATE && conf->cmd != CMD_DRY_RUN) {
|
|
r = 0;
|
|
goto out;
|