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
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
---
|
|
libmultipath/discovery.c | 5 +++++
|
|
libmultipath/structs_vec.c | 2 +-
|
|
multipathd/main.c | 26 +++++---------------------
|
|
3 files changed, 11 insertions(+), 22 deletions(-)
|
|
|
|
Index: multipath-tools-130222/libmultipath/discovery.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/discovery.c
|
|
+++ multipath-tools-130222/libmultipath/discovery.c
|
|
@@ -1188,6 +1188,11 @@ pathinfo (struct path *pp, vector hwtabl
|
|
if (pp->state == PATH_UNCHECKED ||
|
|
pp->state == PATH_WILD)
|
|
goto blank;
|
|
+ if (pp->state == PATH_UP && !pp->size) {
|
|
+ condlog(3, "%s: device size is 0, "
|
|
+ "path unuseable", pp->dev);
|
|
+ pp->state = PATH_GHOST;
|
|
+ }
|
|
} else {
|
|
condlog(3, "%s: path inaccessible", pp->dev);
|
|
pp->chkrstate = pp->state = path_state;
|
|
Index: multipath-tools-130222/libmultipath/structs_vec.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/structs_vec.c
|
|
+++ multipath-tools-130222/libmultipath/structs_vec.c
|
|
@@ -551,7 +551,7 @@ int update_multipath (struct vectors *ve
|
|
|
|
if (pp->state != PATH_DOWN) {
|
|
int oldstate = pp->state;
|
|
- condlog(2, "%s: mark as failed", pp->dev_t);
|
|
+ condlog(2, "%s: mark as failed", pp->dev);
|
|
mpp->stat_path_failures++;
|
|
pp->state = PATH_DOWN;
|
|
if (oldstate == PATH_UP ||
|
|
Index: multipath-tools-130222/multipathd/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/main.c
|
|
+++ multipath-tools-130222/multipathd/main.c
|
|
@@ -538,15 +538,10 @@ ev_add_path (struct path * pp, struct ve
|
|
pp->mpp = mpp;
|
|
rescan:
|
|
if (mpp) {
|
|
- if ((!pp->size) || (mpp->size != pp->size)) {
|
|
- if (!pp->size)
|
|
- condlog(0, "%s: failed to add new path %s, "
|
|
- "device size is 0",
|
|
- mpp->alias, pp->dev);
|
|
- else
|
|
- condlog(0, "%s: failed to add new path %s, "
|
|
- "device size mismatch",
|
|
- mpp->alias, pp->dev);
|
|
+ if (pp->size && mpp->size != pp->size) {
|
|
+ condlog(0, "%s: failed to add new path %s, "
|
|
+ "device size mismatch",
|
|
+ mpp->alias, pp->dev);
|
|
int i = find_slot(vecs->pathvec, (void *)pp);
|
|
if (i != -1)
|
|
vector_del_slot(vecs->pathvec, i);
|
|
@@ -563,18 +558,7 @@ rescan:
|
|
verify_paths(mpp, vecs, NULL);
|
|
mpp->flush_on_last_del = FLUSH_UNDEF;
|
|
mpp->action = ACT_RELOAD;
|
|
- }
|
|
- else {
|
|
- if (!pp->size) {
|
|
- condlog(0, "%s: failed to create new map,"
|
|
- " device size is 0 ", pp->dev);
|
|
- int i = find_slot(vecs->pathvec, (void *)pp);
|
|
- if (i != -1)
|
|
- vector_del_slot(vecs->pathvec, i);
|
|
- free_path(pp);
|
|
- return 1;
|
|
- }
|
|
-
|
|
+ } else {
|
|
if (!should_multipath(pp, vecs->pathvec)) {
|
|
orphan_path(pp);
|
|
return 0;
|