X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_llog.c;fp=lustre%2Fmgs%2Fmgs_llog.c;h=b7dee739364ae1822cc31d8eed035ee5b9cd6988;hp=28203c1adb8155cdbcb9991ed722393c51522d71;hb=8910291fc5ca71588e865ac2ec3a7fbb881a7082;hpb=82c6e42d6137f39a1f2394b7bc6e8d600eb36181

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 28203c1..b7dee73 100644
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -1025,10 +1025,19 @@ static int check_markers(struct lustre_cfg *lcfg,
 			LASSERT(!(marker->cm_flags & CM_START) ||
 				!(marker->cm_flags & CM_END));
 			if (marker->cm_flags & CM_START) {
-				mrd->state = REPLACE_UUID;
-				mrd->failover = NULL;
+				if (!strncmp(marker->cm_comment,
+					     "add failnid", 11)) {
+					mrd->state = REPLACE_SKIP;
+				} else {
+					mrd->state = REPLACE_UUID;
+					mrd->failover = NULL;
+				}
 			} else if (marker->cm_flags & CM_END)
 				mrd->state = REPLACE_COPY;
+
+			if (!strncmp(marker->cm_comment,
+				"add failnid", 11))
+				return 1;
 		}
 	}
 
@@ -1223,6 +1232,11 @@ static int process_command(const struct lu_env *env, struct lustre_cfg *lcfg,
 		return rc ? rc : 1;
 	}
 
+	/* All new UUID are added. Skip. */
+	if (mrd->state == REPLACE_SETUP &&
+		lcfg->lcfg_command == LCFG_ADD_UUID)
+		return 1;
+
 	/* Another commands in target device block */
 	return 0;
 }