From: Hongchao Zhang <hongchao.zhang@intel.com>
Date: Thu, 22 Oct 2015 19:26:45 +0000 (+0800)
Subject: LU-6992 test: wait device to be registered
X-Git-Tag: 2.7.63~25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d76285d649545379b2bbf10aa5bcd3fdf4c9b52a;p=fs%2Flustre-release.git

LU-6992 test: wait device to be registered

in mount_facet, the device label can only be used after the device
registered to MGS and it was rewritten.

Change-Id: I9ed65631391f2be84e484e409fbfe59020d982be
Signed-off-by: Hongchao Zhang <hongchao.zhang@intel.com>
Reviewed-on: http://review.whamcloud.com/16781
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index d7c51ed..15feee6 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1245,23 +1245,46 @@ mount_facet() {
 		                   ${!dev} $mntpt"
 		RC=${PIPESTATUS[0]}
 	fi
+
 	if [ $RC -ne 0 ]; then
 		echo "Start of ${!dev} on ${facet} failed ${RC}"
-    else
-        set_default_debug_facet $facet
+		return $RC
+	fi
+
+	set_default_debug_facet $facet
 
 	if [[ $facet == mds* ]]; then
 		do_facet $facet \
-			lctl set_param -n mdt.${FSNAME}*.enable_remote_dir=1 \
-				2>/dev/null
+		lctl set_param -n mdt.${FSNAME}*.enable_remote_dir=1 2>/dev/null
 	fi
 
-		label=$(devicelabel ${facet} ${!dev})
-        [ -z "$label" ] && echo no label for ${!dev} && exit 1
-        eval export ${facet}_svc=${label}
-        echo Started ${label}
-    fi
-    return $RC
+	if [[ $opts =~ .*nosvc.* ]]; then
+		echo "Start ${!dev} without service"
+	else
+		local fstype=$(facet_fstype $facet)
+
+		case $fstype in
+		ldiskfs)
+			wait_update_facet ${facet} "$E2LABEL ${!dev} \
+				2>/dev/null | grep -E ':[a-zA-Z]{3}[0-9]{4}'" \
+				"" || error "${!dev} failed to initialize!";;
+		zfs)
+			wait_update_facet ${facet} "$ZFS get -H -o value \
+				lustre:svname ${!dev} 2>/dev/null | \
+				grep -E ':[a-zA-Z]{3}[0-9]{4}'" "" ||
+				error "${!dev} failed to initialize!";;
+
+		*)
+			error "unknown fstype!";;
+		esac
+	fi
+
+	label=$(devicelabel ${facet} ${!dev})
+	[ -z "$label" ] && echo no label for ${!dev} && exit 1
+	eval export ${facet}_svc=${label}
+	echo Started ${label}
+
+	return $RC
 }
 
 # start facet device options