X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-sec.sh;h=9744b9ab53800a269ed50dcb77fe0b2aac37f83e;hp=b8964c00afbf216ba7fe0d7c448427cf0db3d6d2;hb=a4fbe7341b;hpb=5930576791e864529e6ef9b46f3e09cc4b635fc2;ds=sidebyside

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index b8964c0..9744b9a 100755
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -475,71 +475,6 @@ squash_id() {
 	fi
 }
 
-wait_nm_sync() {
-	local nodemap_name=$1
-	local key=$2
-	local value=$3
-	local opt=$4
-	local proc_param
-	local is_active=$(do_facet mgs $LCTL get_param -n nodemap.active)
-	local max_retries=20
-	local is_sync
-	local out1=""
-	local out2
-	local mgs_ip=$(host_nids_address $mgs_HOST $NETTYPE | cut -d' ' -f1)
-	local i
-
-	if [ "$nodemap_name" == "active" ]; then
-		proc_param="active"
-	elif [ -z "$key" ]; then
-		proc_param=${nodemap_name}
-	else
-		proc_param="${nodemap_name}.${key}"
-	fi
-	if [ "$opt" == "inactive" ]; then
-		# check nm sync even if nodemap is not activated
-		is_active=1
-		opt=""
-	fi
-	(( is_active == 0 )) && [ "$proc_param" != "active" ] && return
-
-	if [ -z "$value" ]; then
-		out1=$(do_facet mgs $LCTL get_param $opt \
-			nodemap.${proc_param} 2>/dev/null)
-		echo "On MGS ${mgs_ip}, ${proc_param} = $out1"
-	else
-		out1=$value;
-	fi
-
-	# wait up to 10 seconds for other servers to sync with mgs
-	for i in $(seq 1 10); do
-		for node in $(all_server_nodes); do
-		    local node_ip=$(host_nids_address $node $NETTYPE |
-				    cut -d' ' -f1)
-
-		    is_sync=true
-		    if [ -z "$value" ]; then
-			[ $node_ip == $mgs_ip ] && continue
-		    fi
-
-		    out2=$(do_node $node_ip $LCTL get_param $opt \
-				   nodemap.$proc_param 2>/dev/null)
-		    echo "On $node ${node_ip}, ${proc_param} = $out2"
-		    [ "$out1" != "$out2" ] && is_sync=false && break
-		done
-		$is_sync && break
-		sleep 1
-	done
-	if ! $is_sync; then
-		echo MGS
-		echo $out1
-		echo OTHER - IP: $node_ip
-		echo $out2
-		error "mgs and $nodemap_name ${key} mismatch, $i attempts"
-	fi
-	echo "waited $((i - 1)) seconds for sync"
-}
-
 # ensure that the squash defaults are the expected defaults
 squash_id default 99 0
 wait_nm_sync default squash_uid '' inactive