multipath-tools/0007-fix-lun-expansion-failure-when-there-is-offline-path.patch

58 lines
1.8 KiB
Diff
Raw Normal View History

2021-11-23 21:49:34 +08:00
From 1c49c790c50452564b7319b2a427462ad266793f Mon Sep 17 00:00:00 2001
2020-11-04 21:19:44 +08:00
From: renmingshuai <renmingshuai@huawei.com>
Date: Thu, 28 Jan 2021 22:26:58 +0800
2021-11-23 21:49:34 +08:00
Subject: [PATCH 07/15] fix lun expansion failure when there is offline path
2020-11-04 21:19:44 +08:00
---
2021-11-23 21:49:34 +08:00
libmultipath/configure.c | 10 ++++++++++
2020-11-04 21:19:44 +08:00
libmultipath/structs_vec.c | 5 +++--
2021-11-23 21:49:34 +08:00
2 files changed, 13 insertions(+), 2 deletions(-)
2020-11-04 21:19:44 +08:00
2020-01-10 17:13:17 +08:00
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
2021-11-23 21:49:34 +08:00
index fdf8005..84a246b 100644
2020-01-10 17:13:17 +08:00
--- a/libmultipath/configure.c
+++ b/libmultipath/configure.c
2021-11-23 21:49:34 +08:00
@@ -1187,6 +1187,13 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid,
2020-01-10 17:13:17 +08:00
orphan_path(pp1, "only one path");
continue;
}
+
+ /* if path is offline */
+ if (pp1->state == PATH_DOWN) {
+ orphan_path(pp1, "skip offline path");
+ continue;
+ }
+
2021-11-23 21:49:34 +08:00
/* if path is handled before */
if (pp1->handled) {
condlog(3, "%s: skip handled path.", pp1->dev_t);
@@ -1219,6 +1226,9 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid,
2020-01-10 17:13:17 +08:00
if (strcmp(pp1->wwid, pp2->wwid))
continue;
+ if (!pp2->size || pp2->state == PATH_DOWN)
+ continue;
+
if (!mpp->size && pp2->size)
mpp->size = pp2->size;
diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
2021-11-23 21:49:34 +08:00
index 8170150..adc034b 100644
2020-01-10 17:13:17 +08:00
--- a/libmultipath/structs_vec.c
+++ b/libmultipath/structs_vec.c
2021-11-23 21:49:34 +08:00
@@ -722,8 +722,9 @@ int verify_paths(struct multipath *mpp)
2020-01-10 17:13:17 +08:00
/*
* see if path is in sysfs
*/
2020-11-04 21:19:44 +08:00
- if (!pp->udev || sysfs_attr_get_value(pp->udev, "dev",
2020-01-10 17:13:17 +08:00
- pp->dev_t, BLK_DEV_SIZE) < 0) {
2020-11-04 21:19:44 +08:00
+ if (!pp->udev || (sysfs_attr_get_value(pp->udev, "dev",
2020-01-10 17:13:17 +08:00
+ pp->dev_t, BLK_DEV_SIZE) < 0) ||
+ (pp->state == PATH_DOWN && pp->size != mpp->size)) {
if (pp->state != PATH_DOWN) {
condlog(1, "%s: removing valid path %s in state %d",
mpp->alias, pp->dev, pp->state);
2020-11-04 21:19:44 +08:00
--
1.8.3.1