906e1e1128
Modify 0135-RHBZ-1299600-path-dev-uevents.patch
* trigger uevents when adding wwids for existing devices during startup
Refresh 0136-RHBZ-1304687-wait-for-map-add.patch
Refresh 0150-RHBZ-1253913-fix-startup-msg.patch
Modify 0159-UPBZ-1255885-udev-waits.patch
* fix bug in failure path
Add 0160-RH-udev-flags.patch
Add 0161-RHBZ-1311659-no-kpartx.patch
* skip_kpartx option disables kpartx running on multipath devices
Add 0162-RHBZ-1333331-huawei-config.patch
* Add default config for Huawei XSG1 array
Add 0163-UPBZ-1333492-resize-map.patch
* restore old size if resize fails
Add 0164-RHBZ-1311463-dos-part-rollover.patch
* fix incorrect partition size due to 4k device size rollover
Add 0165-UPBZ-1341748-MSA-2040-conf.patch
* Add default config for MSA 2040 array
Add 0166-RHBZ-1323429-dont-allow-new-wwid.patch
* don't allow path wwid to change while it is in use
Add 0167-RHBZ-1335176-fix-show-cmds.patch
* and new show multipath format wildcard, 'f' to sho number of failures.
This will hopefully be useful for tracking what happens to multipath
devices for bz #1335176
Add 0168-RHBZ-1347769-shared-lock.patch
* make multipath lock the path devices with a shared lock
Add 0169-UPBZ-1353357-json-output.patch
* add mulitpathd json output command
Add 0170-UPBZ-1352925-fix-typo.patch
Add 0171-UPBZ-1356651-allow-zero-size.patch
* Allow zero-sized paths to be added to a multipath device
Add 0172-RHBZ-1350931-no-active-add.patch
* Allow paths to be added to a new map if no active paths exist. Also
fixes 1351430
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
---
|
|
multipathd/main.c | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipathd/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/main.c
|
|
+++ multipath-tools-130222/multipathd/main.c
|
|
@@ -530,9 +530,15 @@ ev_add_path (struct path * pp, struct ve
|
|
}
|
|
mpp = find_mp_by_wwid(vecs->mpvec, pp->wwid);
|
|
if (mpp && mpp->wait_for_udev) {
|
|
- mpp->wait_for_udev = 2;
|
|
- orphan_path(pp);
|
|
- return 0;
|
|
+ if (pathcount(mpp, PATH_UP) == 0 &&
|
|
+ (pathcount(mpp, PATH_GHOST) == 0 ||
|
|
+ pp->tpgs == TPGS_IMPLICIT))
|
|
+ mpp->force_udev_reload = 1;
|
|
+ else {
|
|
+ mpp->wait_for_udev = 2;
|
|
+ orphan_path(pp);
|
|
+ return 0;
|
|
+ }
|
|
}
|
|
|
|
pp->mpp = mpp;
|
|
@@ -551,7 +557,8 @@ rescan:
|
|
|
|
condlog(4,"%s: adopting all paths for path %s",
|
|
mpp->alias, pp->dev);
|
|
- mpp->force_udev_reload = !pathcount(mpp, PATH_WILD);
|
|
+ if (pathcount(mpp, PATH_WILD) == 0)
|
|
+ mpp->force_udev_reload = 1;
|
|
if (adopt_paths(vecs->pathvec, mpp, 1))
|
|
goto fail; /* leave path added to pathvec */
|
|
|