From 9fab4f0956292141a72f7144f1d4157d353c0299 Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Thu, 28 Jan 2021 22:26:58 +0800
Subject: [PATCH] fix lun expansion failure when there is offline path

---
 libmultipath/configure.c   | 10 ++++++++++
 libmultipath/structs_vec.c |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libmultipath/configure.c b/libmultipath/configure.c
index 4956d32..ce5bd8b 100644
--- a/libmultipath/configure.c
+++ b/libmultipath/configure.c
@@ -1151,6 +1151,13 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid,
 			orphan_path(pp1, "nvme:tcp path not allowed with request queue_mode multipath device");
 			continue;
 		}
+
+		/* if path is offline */
+		if (pp1->state == PATH_DOWN) {
+			orphan_path(pp1, "skip offline path");
+			continue;
+		}
+
 		/* if path is handled before */
 		if (pp1->handled) {
 			condlog(3, "%s: skip handled path.", pp1->dev_t);
@@ -1182,6 +1189,9 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid,
 			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
index 61001aa..317d172 100644
--- a/libmultipath/structs_vec.c
+++ b/libmultipath/structs_vec.c
@@ -742,8 +742,9 @@ int verify_paths(struct multipath *mpp)
 		/*
 		 * see if path is in sysfs
 		 */
-		if (!pp->udev || sysfs_attr_get_value(pp->udev, "dev",
-					 pp->dev_t, BLK_DEV_SIZE) < 0) {
+		if (!pp->udev || (sysfs_attr_get_value(pp->udev, "dev",
+					 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);
-- 
2.33.0