X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_llog.c;h=2dc1a8ab87aa31cedf6e89539a7b158630aa138c;hb=337b1d1bb301725b91380326985af52a5bede3a1;hp=2eb650c4f366cc0c8e126cf1f101167358277ca0;hpb=be237a523e1208888f8f7d10e2a88709ea823a74;p=fs%2Flustre-release.git

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 2eb650c..2dc1a8a 100644
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -1513,23 +1513,21 @@ static int only_mgs_is_running(struct obd_device *mgs_obd)
 		/* skip self export */
 		if (exp == mgs_obd->obd_self_export)
 			continue;
-		if (exp_connect_flags(exp) & OBD_CONNECT_MDS_MDS)
-			continue;
 
 		++num_exports;
 
-		CERROR("%s: node %s still connected during replace_nids "
-		       "connect_flags:%llx\n",
-		       mgs_obd->obd_name,
-		       libcfs_nid2str(exp->exp_nid_stats->nid),
-		       exp_connect_flags(exp));
-
+		if (num_exports > 1)
+			CERROR("%s: node %s still connected during replace_nids connect_flags:%llx\n",
+			       mgs_obd->obd_name,
+			       libcfs_nid2str(exp->exp_nid_stats->nid),
+			       exp_connect_flags(exp));
 	}
 	spin_unlock(&mgs_obd->obd_dev_lock);
 
-	/* osd, MGS and MGC + self_export
-	   (wc -l /proc/fs/lustre/devices <= 2) && (non self exports == 0) */
-	return (num_devices <= 3) && (num_exports == 0);
+	/* osd, MGS and MGC + MGC export (nosvc starts MGC)
+	 *  (wc -l /proc/fs/lustre/devices <= 3) && (non self exports == 1)
+	 */
+	return (num_devices <= 3) && (num_exports <= 1);
 }
 
 static int name_create_mdt(char **logname, char *fsname, int mdt_idx)