X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-sec.sh;h=9f3446fe31024b3c17a6c6ac3148908607564e7d;hb=5042d4c8ecad287276e04c52c6a1fee9c9b597a9;hp=ae5112b2c18f0dc951533750a7626c96ab1be9ef;hpb=583fef9966f2e531b1c255cabaf1fbaa323e8e5d;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
old mode 100644
new mode 100755
index ae5112b..9f3446f
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -11,10 +11,7 @@ ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="                2     5     6    $SANITY_SEC_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-[ "$ALWAYS_EXCEPT$EXCEPT" ] && \
-	echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
-
-SRCDIR=`dirname $0`
+SRCDIR=$(dirname $0)
 export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
 export NAME=${NAME:-local}
 
@@ -24,6 +21,18 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+NODEMAP_TESTS=$(seq 7 26)
+
+if ! check_versions; then
+	echo "It is NOT necessary to test nodemap under interoperation mode"
+	EXCEPT="$EXCEPT $NODEMAP_TESTS"
+fi
+
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"
+
+[ "$ALWAYS_EXCEPT$EXCEPT$EXCEPT_SLOW" ] &&
+	echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT $EXCEPT_SLOW"
+
 RUNAS_CMD=${RUNAS_CMD:-runas}
 
 WTL=${WTL:-"$LUSTRE/tests/write_time_limit"}
@@ -48,14 +57,14 @@ clients_arr=($clients)
 
 ID0=${ID0:-500}
 ID1=${ID1:-501}
-USER0=$(grep :$ID0:$ID0: /etc/passwd | cut -d: -f1)
-USER1=$(grep :$ID1:$ID1: /etc/passwd | cut -d: -f1)
+USER0=$(getent passwd | grep :$ID0:$ID0: | cut -d: -f1)
+USER1=$(getent passwd | grep :$ID1:$ID1: | cut -d: -f1)
 
 [ -z "$USER0" ] &&
-	skip "need to add user0 ($ID0:$ID0) to /etc/passwd" && exit 0
+	skip "need to add user0 ($ID0:$ID0)" && exit 0
 
 [ -z "$USER1" ] &&
-	skip "need to add user1 ($ID1:$ID1) to /etc/passwd" && exit 0
+	skip "need to add user1 ($ID1:$ID1)" && exit 0
 
 IDBASE=${IDBASE:-60000}
 
@@ -74,10 +83,10 @@ sec_cleanup() {
 }
 
 DIR=${DIR:-$MOUNT}
-[ -z "`echo $DIR | grep $MOUNT`" ] && \
+[ -z "$(echo $DIR | grep $MOUNT)" ] &&
 	error "$DIR not in $MOUNT" && sec_cleanup && exit 1
 
-[ `echo $MOUNT | wc -w` -gt 1 ] && \
+[ $(echo $MOUNT | wc -w) -gt 1 ] &&
 	echo "NAME=$MOUNT mounted more than once" && sec_cleanup && exit 0
 
 # for GSS_SUP
@@ -124,19 +133,19 @@ sec_login() {
 	if ! $RUNAS_CMD -u $user -g $group ls $DIR > /dev/null 2>&1; then
 		$RUNAS_CMD -u $user lfs flushctx -k
 		$RUNAS_CMD -u $user krb5_login.sh
-                if ! $RUNAS_CMD -u$user -g$group ls $DIR > /dev/null 2>&1; then
-                        error "init $user $group failed."
-                        exit 2
-                fi
+		if ! $RUNAS_CMD -u$user -g$group ls $DIR > /dev/null 2>&1; then
+			error "init $user $group failed."
+			exit 2
+		fi
 	fi
 }
 
 declare -a identity_old
 
 sec_setup() {
-       	for num in `seq $MDSCOUNT`; do
-       		switch_identity $num true || identity_old[$num]=$?
-       	done
+	for num in $(seq $MDSCOUNT); do
+		switch_identity $num true || identity_old[$num]=$?
+	done
 
 	if ! $RUNAS_CMD -u $ID0 ls $DIR > /dev/null 2>&1; then
 		sec_login $USER0 $USER0
@@ -158,16 +167,16 @@ test_0() {
 
 	if [ "$CLIENT_TYPE" = "remote" ]; then
 		do_facet $SINGLEMDS "echo '* 0 normtown' > $PERM_CONF"
-	        do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
+		do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 		chown $USER0 $DIR/$tdir && error "chown (1)"
 		do_facet $SINGLEMDS "echo '* 0 rmtown' > $PERM_CONF"
-	        do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
+		do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 	else
 		chown $USER0 $DIR/$tdir || error "chown (2)"
 	fi
 
 	$RUNAS_CMD -u $ID0 ls $DIR || error "ls (1)"
-        rm -f $DIR/f0 || error "rm (2)"
+	rm -f $DIR/f0 || error "rm (2)"
 	$RUNAS_CMD -u $ID0 touch $DIR/f0 && error "touch (1)"
 	$RUNAS_CMD -u $ID0 touch $DIR/$tdir/f1 || error "touch (2)"
 	$RUNAS_CMD -u $ID1 touch $DIR/$tdir/f2 && error "touch (3)"
@@ -182,7 +191,7 @@ test_0() {
 
 	if [ "$CLIENT_TYPE" = "remote" ]; then
 		do_facet $SINGLEMDS "rm -f $PERM_CONF"
-	        do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
+		do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 	fi
 }
 run_test 0 "uid permission ============================="
@@ -193,7 +202,7 @@ test_1() {
 
 	if [ "$CLIENT_TYPE" = "remote" ]; then
 		do_facet $SINGLEMDS "echo '* 0 rmtown' > $PERM_CONF"
-	        do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
+		do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 	fi
 
 	rm -rf $DIR/$tdir
@@ -227,18 +236,18 @@ test_1() {
 run_test 1 "setuid/gid ============================="
 
 run_rmtacl_subtest() {
-    $SAVE_PWD/rmtacl/run $SAVE_PWD/rmtacl/$1.test
-    return $?
+	$SAVE_PWD/rmtacl/run $SAVE_PWD/rmtacl/$1.test
+	return $?
 }
 
 # remote_acl
 # for remote client only
 test_2 () {
-	[ "$CLIENT_TYPE" = "local" ] && \
+	[ "$CLIENT_TYPE" = "local" ] &&
 		skip "remote_acl for remote client only" && return
-    	[ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep ^acl)" ] && \
+	[ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep ^acl)" ] &&
 		skip "must have acl enabled" && return
-    	[ -z "$(which setfacl 2>/dev/null)" ] && \
+	[ -z "$(which setfacl 2>/dev/null)" ] &&
 		skip "could not find setfacl" && return
 	[ "$UID" != 0 ] && skip "must run as root" && return
 
@@ -250,57 +259,57 @@ test_2 () {
 	sec_login daemon daemon
 	sec_login games users
 
-    	SAVE_UMASK=`umask`
-    	umask 0022
-    	cd $DIR
-
-        echo "performing cp ..."
-        run_rmtacl_subtest cp || error "cp"
-    	echo "performing getfacl-noacl..."
-    	run_rmtacl_subtest getfacl-noacl || error "getfacl-noacl"
-    	echo "performing misc..."
-    	run_rmtacl_subtest misc || error "misc"
-    	echo "performing permissions..."
-    	run_rmtacl_subtest permissions || error "permissions"
-    	echo "performing setfacl..."
-    	run_rmtacl_subtest setfacl || error "setfacl"
-
-    	# inheritance test got from HP
-    	echo "performing inheritance..."
-    	cp $SAVE_PWD/rmtacl/make-tree .
-    	chmod +x make-tree
-    	run_rmtacl_subtest inheritance || error "inheritance"
-    	rm -f make-tree
-
-    	cd $SAVE_PWD
-    	umask $SAVE_UMASK
+	SAVE_UMASK=$(umask)
+	umask 0022
+	cd $DIR
+
+	echo "performing cp ..."
+	run_rmtacl_subtest cp || error "cp"
+	echo "performing getfacl-noacl..."
+	run_rmtacl_subtest getfacl-noacl || error "getfacl-noacl"
+	echo "performing misc..."
+	run_rmtacl_subtest misc || error "misc"
+	echo "performing permissions..."
+	run_rmtacl_subtest permissions || error "permissions"
+	echo "performing setfacl..."
+	run_rmtacl_subtest setfacl || error "setfacl"
+
+	# inheritance test got from HP
+	echo "performing inheritance..."
+	cp $SAVE_PWD/rmtacl/make-tree .
+	chmod +x make-tree
+	run_rmtacl_subtest inheritance || error "inheritance"
+	rm -f make-tree
+
+	cd $SAVE_PWD
+	umask $SAVE_UMASK
 
 	do_facet $SINGLEMDS "rm -f $PERM_CONF"
 	do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 }
 run_test 2 "rmtacl ============================="
 
-# rootsquash
-# root_squash will be redesigned in Lustre 1.7
-test_3() {
-        skip "root_squash will be redesigned in Lustre 1.7" && return
-}
-run_test 3 "rootsquash ============================="
-
 # bug 3285 - supplementary group should always succeed.
 # NB: the supplementary groups are set for local client only,
 # as for remote client, the groups of the specified uid on MDT
 # will be obtained by upcall /sbin/l_getidentity and used.
 test_4() {
+	local server_version=$(lustre_version_code $SINGLEMDS)
+
+	[[ $server_version -ge $(version_code 2.6.93) ]] ||
+	[[ $server_version -ge $(version_code 2.5.35) &&
+	   $server_version -lt $(version_code 2.5.50) ]] ||
+		{ skip "Need MDS version at least 2.6.93 or 2.5.35"; return; }
+
 	if [ "$CLIENT_TYPE" = "remote" ]; then
 		do_facet $SINGLEMDS "echo '* 0 rmtown' > $PERM_CONF"
 	        do_facet $SINGLEMDS "lctl set_param -n $IDENTITY_FLUSH=-1"
 	fi
 
 	rm -rf $DIR/$tdir
-        mkdir -p $DIR/$tdir
-        chmod 0771 $DIR/$tdir
-        chgrp $ID0 $DIR/$tdir
+	mkdir -p $DIR/$tdir
+	chmod 0771 $DIR/$tdir
+	chgrp $ID0 $DIR/$tdir
 	$RUNAS_CMD -u $ID0 ls $DIR/$tdir || error "setgroups (1)"
 	if [ "$CLIENT_TYPE" = "local" ]; then
 		do_facet $SINGLEMDS "echo '* $ID1 setgrp' > $PERM_CONF"
@@ -324,15 +333,15 @@ create_nodemaps() {
 	squash_id default 99 0
 	squash_id default 99 1
 	for (( i = 0; i < NODEMAP_COUNT; i++ )); do
-		if ! do_facet mgs $LCTL nodemap_add			\
-		       	${HOSTNAME_CHECKSUM}_${i}; then
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		if ! do_facet mgs $LCTL nodemap_add $csum; then
 		       	return 1
 		fi
-		out=$(do_facet mgs $LCTL get_param			\
-			nodemap.${HOSTNAME_CHECKSUM}_${i}.id)
+
+		out=$(do_facet mgs $LCTL get_param nodemap.$csum.id)
 		## This needs to return zero if the following statement is 1
-		rc=$(echo $out | grep -c ${HOSTNAME_CHECKSUM}_${i})
-		[[ $rc == 0 ]] && return 1
+		[[ $(echo $out | grep -c $csum) == 0 ]] && return 1
 	done
 	return 0
 }
@@ -340,19 +349,17 @@ create_nodemaps() {
 delete_nodemaps() {
 	local i
 	local out
-	local rc
 
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
-		if ! do_facet mgs $LCTL nodemap_del 			\
-			${HOSTNAME_CHECKSUM}_${i}; then
-			error "nodemap_del ${HOSTNAME_CHECKSUM}_${i} 	\
-				failed with $rc"
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		if ! do_facet mgs $LCTL nodemap_del $csum; then
+			error "nodemap_del $csum failed with $?"
 			return 3
 		fi
-		out=$(do_facet mgs $LCTL get_param 			\
-			nodemap.${HOSTNAME_CHECKSUM}_${i}.id)
-		rc=$(echo $out | grep -c ${HOSTNAME_CHECKSUM}_${i})
-		[[ $rc != 0 ]] && return 1
+
+		out=$(do_facet mgs $LCTL get_param nodemap.$csum.id)
+		[[ $(echo $out | grep -c $csum) != 0 ]] && return 1
 	done
 	return 0
 }
@@ -365,9 +372,8 @@ add_range() {
 
 	for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
 		range="$SUBNET_CHECKSUM.${2}.${j}.[1-253]@tcp"
-		if ! do_facet mgs $cmd --name $1	\
-			--range $range; then
-			rc=$(($rc + 1))
+		if ! do_facet mgs $cmd --name $1 --range $range; then
+			rc=$((rc + 1))
 		fi
 	done
 	return $rc
@@ -381,9 +387,8 @@ delete_range() {
 
 	for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
 		range="$SUBNET_CHECKSUM.${2}.${j}.[1-253]@tcp"
-		if ! do_facet mgs $cmd --name $1	\
-			--range $range; then
-			rc=$(($rc + 1))
+		if ! do_facet mgs $cmd --name $1 --range $range; then
+			rc=$((rc + 1))
 		fi
 	done
 
@@ -392,25 +397,24 @@ delete_range() {
 
 add_idmaps() {
 	local i
-	local j
-	local client_id
-	local fs_id
 	local cmd="$LCTL nodemap_add_idmap"
 	local rc=0
 
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
+		local j
+
 		for ((j = 500; j < NODEMAP_MAX_ID; j++)); do
-			client_id=$j
-			fs_id=$(($j + 1))
-			if ! do_facet mgs $cmd				\
-			--name ${HOSTNAME_CHECKSUM}_${i}		\
-		       	--idtype uid --idmap $client_id:$fs_id; then
-				rc=$(($rc + 1))
+			local csum=${HOSTNAME_CHECKSUM}_${i}
+			local client_id=$j
+			local fs_id=$((j + 1))
+
+			if ! do_facet mgs $cmd --name $csum --idtype uid \
+			     --idmap $client_id:$fs_id; then
+				rc=$((rc + 1))
 			fi
-			if ! do_facet mgs $cmd				\
-			--name ${HOSTNAME_CHECKSUM}_${i}		\
-		       	--idtype gid --idmap $client_id:$fs_id; then
-				rc=$(($rc + 1))
+			if ! do_facet mgs $cmd --name $csum --idtype gid \
+			     --idmap $client_id:$fs_id; then
+				rc=$((rc + 1))
 			fi
 		done
 	done
@@ -420,25 +424,24 @@ add_idmaps() {
 
 delete_idmaps() {
 	local i
-	local j
-	local client_id
-	local fs_id
 	local cmd="$LCTL nodemap_del_idmap"
 	local rc=0
 
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
+		local j
+
 		for ((j = 500; j < NODEMAP_MAX_ID; j++)); do
-			client_id=$j
-			fs_id=$(($j + 1))
-			if ! do_facet mgs $cmd				\
-			--name ${HOSTNAME_CHECKSUM}_${i}		\
-		       	--idtype uid --idmap $client_id:$fs_id; then
-				rc=$(($rc + 1))
+			local csum=${HOSTNAME_CHECKSUM}_${i}
+			local client_id=$j
+			local fs_id=$((j + 1))
+
+			if ! do_facet mgs $cmd --name $csum --idtype uid \
+			     --idmap $client_id:$fs_id; then
+				rc=$((rc + 1))
 			fi
-			if ! do_facet mgs $cmd				\
-			--name ${HOSTNAME_CHECKSUM}_${i}		\
-		       	--idtype gid --idmap $client_id:$fs_id; then
-				rc=$(($rc + 1))
+			if ! do_facet mgs $cmd --name $csum --idtype gid \
+			     --idmap $client_id:$fs_id; then
+				rc=$((rc + 1))
 			fi
 		done
 	done
@@ -459,15 +462,13 @@ modify_flags() {
 	option[1]="trusted"
 
 	for ((idx = 0; idx < 2; idx++)); do
-		if ! do_facet mgs $cmd --name $1	\
-			--property ${option[$idx]}	\
-			--value 1; then
+		if ! do_facet mgs $cmd --name $1 --property ${option[$idx]} \
+		     --value 1; then
 			rc=$((rc + 1))
 		fi
 
-		if ! do_facet mgs $cmd --name $1	\
-			--property ${option[$idx]}	\
-			--value 0; then
+		if ! do_facet mgs $cmd --name $1 --property ${option[$idx]} \
+		     --value 0; then
 			rc=$((rc + 1))
 		fi
 	done
@@ -476,6 +477,9 @@ modify_flags() {
 }
 
 squash_id() {
+	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
+		return
 	local cmd
 
 	cmd[0]="$LCTL nodemap_modify --property squash_uid"
@@ -506,20 +510,20 @@ test_nid() {
 
 test_idmap() {
 	local i
-	local j
-	local fs_id
 	local cmd="$LCTL nodemap_test_id"
 	local rc=0
 
 	## nodemap deactivated
-	if ! do_facet mgs lctl nodemap_activate 0; then
+	if ! do_facet mgs $LCTL nodemap_activate 0; then
 		return 1
 	fi
 	for ((id = 500; id < NODEMAP_MAX_ID; id++)); do
+		local j
+
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
-			nid="$SUBNET_CHECKSUM.0.${j}.100@tcp"
-			fs_id=$(do_facet mgs $cmd --nid $nid	\
-				--idtype uid --id $id)
+			local nid="$SUBNET_CHECKSUM.0.${j}.100@tcp"
+			local fs_id=$(do_facet mgs $cmd --nid $nid	\
+				      --idtype uid --id $id)
 			if [ $fs_id != $id ]; then
 				echo "expected $id, got $fs_id"
 				rc=$((rc + 1))
@@ -528,7 +532,7 @@ test_idmap() {
 	done
 
 	## nodemap activated
-	if ! do_facet mgs lctl nodemap_activate 1; then
+	if ! do_facet mgs $LCTL nodemap_activate 1; then
 		return 2
 	fi
 
@@ -547,11 +551,11 @@ test_idmap() {
 
 	## trust client ids
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
-		if ! do_facet mgs $LCTL nodemap_modify			\
-				--name ${HOSTNAME_CHECKSUM}_${i}	\
-				--property trusted --value 1; then
-			error "nodemap_modify ${HOSTNAME_CHECKSUM}_${i} "
-				"failed with $rc"
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		if ! do_facet mgs $LCTL nodemap_modify --name $csum \
+		     --property trusted --value 1; then
+			error "nodemap_modify $csum failed with $?"
 			return 3
 		fi
 	done
@@ -570,11 +574,11 @@ test_idmap() {
 
 	## ensure allow_root_access is enabled
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
-		if ! do_facet mgs $LCTL nodemap_modify		\
-			--name ${HOSTNAME_CHECKSUM}_${i}	\
-			--property admin --value 1; then
-			error "nodemap_modify ${HOSTNAME_CHECKSUM}_${i} "
-				"failed with $rc"
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		if ! do_facet mgs $LCTL nodemap_modify --name $csum	\
+		     --property admin --value 1; then
+			error "nodemap_modify $csum failed with $?"
 			return 3
 		fi
 	done
@@ -591,8 +595,9 @@ test_idmap() {
 
 	## ensure allow_root_access is disabled
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
-		if ! do_facet mgs $LCTL nodemap_modify		\
-				--name ${HOSTNAME_CHECKSUM}_${i}	\
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		if ! do_facet mgs $LCTL nodemap_modify --name $csum	\
 				--property admin --value 0; then
 			error "nodemap_modify ${HOSTNAME_CHECKSUM}_${i} "
 				"failed with $rc"
@@ -951,16 +956,46 @@ test_15() {
 }
 run_test 15 "test id mapping"
 
-# Until nodemaps are distributed by MGS, they need to be distributed manually
-# This function and all calls to it should be removed once the MGS distributes
-# nodemaps to the MDS and OSS nodes directly.
-do_servers_not_mgs() {
-	local mgs_ip=$(host_nids_address $mgs_HOST $NETTYPE)
-	for node in $(all_server_nodes); do
-		local node_ip=$(host_nids_address $node $NETTYPE)
-		[ $node_ip == $mgs_ip ] && continue
-		do_node $node_ip $*
+wait_nm_sync() {
+	local nodemap_name=$1
+	local key=$2
+	local proc_param="${nodemap_name}.${key}"
+	[ "$nodemap_name" == "active" ] && proc_param="active"
+
+	local is_active=$(do_facet mgs $LCTL get_param -n nodemap.active)
+	(( is_active == 0 )) && [ "$proc_param" != "active" ] && return
+
+	local max_retries=20
+	local is_sync
+	local out1=$(do_facet mgs $LCTL get_param nodemap.${proc_param})
+	local out2
+	local mgs_ip=$(host_nids_address $mgs_HOST $NETTYPE | cut -d' ' -f1)
+	local i
+
+	# 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
+		    [ $node_ip == $mgs_ip ] && continue
+
+		    out2=$(do_node $node_ip $LCTL get_param \
+				   nodemap.$proc_param 2>/dev/null)
+		    [ "$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"
 }
 
 create_fops_nodemaps() {
@@ -972,26 +1007,15 @@ create_fops_nodemaps() {
 		do_facet mgs $LCTL nodemap_add c${i} || return 1
 		do_facet mgs $LCTL nodemap_add_range 	\
 			--name c${i} --range $client_nid || return 1
-		do_servers_not_mgs $LCTL set_param nodemap.add_nodemap=c${i} ||
-			return 1
-		do_servers_not_mgs "$LCTL set_param \
-			nodemap.add_nodemap_range='c${i} $client_nid'" ||
-			return 1
 		for map in ${FOPS_IDMAPS[i]}; do
 			do_facet mgs $LCTL nodemap_add_idmap --name c${i} \
 				--idtype uid --idmap ${map} || return 1
-			do_servers_not_mgs "$LCTL set_param \
-				nodemap.add_nodemap_idmap='c$i uid ${map}'" ||
-				return 1
 			do_facet mgs $LCTL nodemap_add_idmap --name c${i} \
 				--idtype gid --idmap ${map} || return 1
-			do_servers_not_mgs "$LCTL set_param \
-				nodemap.add_nodemap_idmap='c$i gid ${map}'" ||
-				return 1
 		done
-		out1=$(do_facet mgs $LCTL get_param nodemap.c${i}.idmap)
-		out2=$(do_facet ost0 $LCTL get_param nodemap.c${i}.idmap)
-		[ "$out1" != "$out2" ] && error "mgs and oss maps mismatch"
+
+		wait_nm_sync c$i idmap
+
 		i=$((i + 1))
 	done
 	return 0
@@ -1002,8 +1026,6 @@ delete_fops_nodemaps() {
 	local client
 	for client in $clients; do
 		do_facet mgs $LCTL nodemap_del c${i} || return 1
-		do_servers_not_mgs $LCTL set_param nodemap.remove_nodemap=c$i ||
-			return 1
 		i=$((i + 1))
 	done
 	return 0
@@ -1030,8 +1052,9 @@ fops_test_setup() {
 
 	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
 	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=1
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
 
 	do_node ${clients_arr[0]} rm -rf $DIR/$tdir
 	nm_test_mkdir
@@ -1041,12 +1064,79 @@ fops_test_setup() {
 		--property admin --value $admin
 	do_facet mgs $LCTL nodemap_modify --name c0 \
 		--property trusted --value $trust
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=$admin
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=$trust
 
 	# flush MDT locks to make sure they are reacquired before test
-	do_node ${clients_arr[0]} lctl set_param \
+	do_node ${clients_arr[0]} $LCTL set_param \
 		ldlm.namespaces.$FSNAME-MDT*.lru_size=clear
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
+}
+
+# fileset test directory needs to be initialized on a privileged client
+fileset_test_setup() {
+	local admin=$(do_facet mgs $LCTL get_param -n nodemap.c0.admin_nodemap)
+	local trust=$(do_facet mgs $LCTL get_param -n \
+		nodemap.c0.trusted_nodemap)
+
+	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
+	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 1
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
+
+	# create directory and populate it for subdir mount
+	do_node ${clients_arr[0]} mkdir $MOUNT/$subdir ||
+		error "unable to create dir $MOUNT/$subdir"
+	do_node ${clients_arr[0]} touch $MOUNT/$subdir/this_is_$subdir ||
+		error "unable to create file $MOUNT/$subdir/this_is_$subdir"
+	do_node ${clients_arr[0]} mkdir $MOUNT/$subdir/$subsubdir ||
+		error "unable to create dir $MOUNT/$subdir/$subsubdir"
+	do_node ${clients_arr[0]} touch \
+			$MOUNT/$subdir/$subsubdir/this_is_$subsubdir ||
+		error "unable to create file \
+			$MOUNT/$subdir/$subsubdir/this_is_$subsubdir"
+
+	do_facet mgs $LCTL nodemap_modify --name c0 \
+		--property admin --value $admin
+	do_facet mgs $LCTL nodemap_modify --name c0 \
+		--property trusted --value $trust
+
+	# flush MDT locks to make sure they are reacquired before test
+	do_node ${clients_arr[0]} $LCTL set_param \
+		ldlm.namespaces.$FSNAME-MDT*.lru_size=clear
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
+}
+
+# fileset test directory needs to be initialized on a privileged client
+fileset_test_cleanup() {
+	local admin=$(do_facet mgs $LCTL get_param -n nodemap.c0.admin_nodemap)
+	local trust=$(do_facet mgs $LCTL get_param -n \
+		nodemap.c0.trusted_nodemap)
+
+	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
+	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 1
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
+
+	# cleanup directory created for subdir mount
+	do_node ${clients_arr[0]} rm -rf $MOUNT/$subdir ||
+		error "unable to remove dir $MOUNT/$subdir"
+
+	do_facet mgs $LCTL nodemap_modify --name c0 \
+		--property admin --value $admin
+	do_facet mgs $LCTL nodemap_modify --name c0 \
+		--property trusted --value $trust
+
+	# flush MDT locks to make sure they are reacquired before test
+	do_node ${clients_arr[0]} $LCTL set_param \
+		ldlm.namespaces.$FSNAME-MDT*.lru_size=clear
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
 }
 
 do_create_delete() {
@@ -1063,8 +1153,8 @@ do_create_delete() {
 
 	local res="$c $d"
 	local expected=$(get_cr_del_expected $key)
-	[ "$res" != "$expected" ] && error "test $key expected " \
-		"$expected, got $res" && rc=$(($rc+1))
+	[ "$res" != "$expected" ] &&
+		error "test $key, wanted $expected, got $res" && rc=$((rc + 1))
 	return $rc
 }
 
@@ -1081,23 +1171,23 @@ do_fops_quota_test() {
 	local qused_high=$((qused_orig + quota_fuzz))
 	local qused_low=$((qused_orig - quota_fuzz))
 	local testfile=$DIR/$tdir/$tfile
-	chmod 777 $DIR/$tdir
-	$run_u dd if=/dev/zero of=$testfile bs=1M count=1 >& /dev/null
+	$run_u dd if=/dev/zero of=$testfile bs=1M count=1 >& /dev/null ||
+		error "unable to write quota test file"
 	sync; sync_all_data || true
 
 	local qused_new=$(nodemap_check_quota "$run_u")
-	[ $((qused_new)) -lt $((qused_low + 1024)) \
-		-o $((qused_new)) -gt $((qused_high + 1024)) ] &&
-		error "$qused_new != $qused_orig + 1M after write, \
-		      fuzz is $quota_fuzz"
-	$run_u rm $testfile && d=1
-	$NODEMAP_TEST_QUOTA && wait_delete_completed_mds
+	[ $((qused_new)) -lt $((qused_low + 1024)) -o \
+	  $((qused_new)) -gt $((qused_high + 1024)) ] &&
+		error "$qused_new != $qused_orig + 1M after write, " \
+		      "fuzz is $quota_fuzz"
+	$run_u rm $testfile || error "unable to remove quota test file"
+	wait_delete_completed_mds
 
 	qused_new=$(nodemap_check_quota "$run_u")
 	[ $((qused_new)) -lt $((qused_low)) \
 		-o $((qused_new)) -gt $((qused_high)) ] &&
-		error "quota not reclaimed, expect $qused_orig got $qused_new, \
-		      fuzz $quota_fuzz"
+		error "quota not reclaimed, expect $qused_orig, " \
+		      "got $qused_new, fuzz $quota_fuzz"
 }
 
 get_fops_mapped_user() {
@@ -1159,8 +1249,8 @@ get_cr_del_expected() {
 	[ "$mapped_user" == "-1" ] &&
 		error "unable to find mapping for client user $cli_user"
 
-	if [ "$mapped_user" == "$mds_user" -a  \
-			$(((mode & 0300) == 0300)) -eq 1 ]; then
+	if [ "$mapped_user" == "$mds_user" -a \
+	     $(((mode & 0300) == 0300)) -eq 1 ]; then
 		echo $SUCCESS
 		return
 	fi
@@ -1171,6 +1261,68 @@ get_cr_del_expected() {
 	echo $FAILURE
 }
 
+test_fops_admin_cli_i=""
+test_fops_chmod_dir() {
+	local current_cli_i=$1
+	local perm_bits=$2
+	local dir_to_chmod=$3
+	local new_admin_cli_i=""
+
+	# do we need to set up a new admin client?
+	[ "$current_cli_i" == "0" ] && [ "$test_fops_admin_cli_i" != "1" ] &&
+		new_admin_cli_i=1
+	[ "$current_cli_i" != "0" ] && [ "$test_fops_admin_cli_i" != "0" ] &&
+		new_admin_cli_i=0
+
+	# if only one client, and non-admin, need to flip admin everytime
+	if [ "$num_clients" == "1" ]; then
+		test_fops_admin_client=$clients
+		test_fops_admin_val=$(do_facet mgs $LCTL get_param -n \
+			nodemap.c0.admin_nodemap)
+		if [ "$test_fops_admin_val" != "1" ]; then
+			do_facet mgs $LCTL nodemap_modify \
+				--name c0 \
+				--property admin \
+				--value 1
+			wait_nm_sync c0 admin_nodemap
+		fi
+	elif [ "$new_admin_cli_i" != "" ]; then
+		# restore admin val to old admin client
+		if [ "$test_fops_admin_cli_i" != "" ] &&
+				[ "$test_fops_admin_val" != "1" ]; then
+			do_facet mgs $LCTL nodemap_modify \
+				--name c${test_fops_admin_cli_i} \
+				--property admin \
+				--value $test_fops_admin_val
+			wait_nm_sync c${test_fops_admin_cli_i} admin_nodemap
+		fi
+
+		test_fops_admin_cli_i=$new_admin_cli_i
+		test_fops_admin_client=${clients_arr[$new_admin_cli_i]}
+		test_fops_admin_val=$(do_facet mgs $LCTL get_param -n \
+			nodemap.c${new_admin_cli_i}.admin_nodemap)
+
+		if [ "$test_fops_admin_val" != "1" ]; then
+			do_facet mgs $LCTL nodemap_modify \
+				--name c${new_admin_cli_i} \
+				--property admin \
+				--value 1
+			wait_nm_sync c${new_admin_cli_i} admin_nodemap
+		fi
+	fi
+
+	do_node $test_fops_admin_client chmod $perm_bits $DIR/$tdir || return 1
+
+	# remove admin for single client if originally non-admin
+	if [ "$num_clients" == "1" ] && [ "$test_fops_admin_val" != "1" ]; then
+		do_facet mgs $LCTL nodemap_modify --name c0 --property admin \
+			--value 0
+		wait_nm_sync c0 admin_nodemap
+	fi
+
+	return 0
+}
+
 test_fops() {
 	local mapmode="$1"
 	local single_client="$2"
@@ -1197,8 +1349,6 @@ test_fops() {
 		local cli_i=0
 		for client in $clients; do
 			local u
-			local admin=$(do_facet mgs $LCTL get_param -n \
-				nodemap.c$cli_i.admin_nodemap)
 			for u in ${client_user_list[$cli_i]}; do
 				local run_u="do_node $client \
 					     $RUNAS_CMD -u$u -g$u -G$u"
@@ -1206,25 +1356,15 @@ test_fops() {
 					local mode=$(printf %03o $perm_bits)
 					local key
 					key="$mapmode:$user:c$cli_i:$u:$mode"
-					do_facet mgs $LCTL nodemap_modify \
-						--name c$cli_i \
-						--property admin \
-						--value 1
-					do_servers_not_mgs $LCTL set_param \
-						nodemap.c$cli_i.admin_nodemap=1
-					do_node $client chmod $mode $DIR/$tdir \
-						|| error unable to chmod $key
-					do_facet mgs $LCTL nodemap_modify \
-						--name c$cli_i \
-						--property admin \
-						--value $admin
-					do_servers_not_mgs $LCTL set_param \
-					    nodemap.c$cli_i.admin_nodemap=$admin
-
+					test_fops_chmod_dir $cli_i $mode \
+						$DIR/$tdir ||
+							error cannot chmod $key
 					do_create_delete "$run_u" "$key"
 				done
 
 				# check quota
+				test_fops_chmod_dir $cli_i 777 $DIR/$tdir ||
+					error cannot chmod $key
 				do_fops_quota_test "$run_u"
 			done
 
@@ -1246,37 +1386,43 @@ nodemap_version_check () {
 
 nodemap_test_setup() {
 	local rc
-	local active_nodemap=$1
+	local active_nodemap=1
+
+	[ "$1" == "0" ] && active_nodemap=0
 
-	do_nodes $(comma_list $(all_mdts_nodes)) $LCTL set_param \
-		mdt.*.identity_upcall=NONE
+	do_nodes $(comma_list $(all_mdts_nodes)) \
+		$LCTL set_param mdt.*.identity_upcall=NONE
 
 	rc=0
 	create_fops_nodemaps
 	rc=$?
 	[[ $rc != 0 ]] && error "adding fops nodemaps failed $rc"
 
-	if [ "$active_nodemap" == "0" ]; then
-		do_facet mgs $LCTL set_param nodemap.active=0
-		do_servers_not_mgs $LCTL set_param nodemap.active=0
-		return
-	fi
+	do_facet mgs $LCTL nodemap_activate $active_nodemap
+	wait_nm_sync active
 
-	do_facet mgs $LCTL nodemap_activate 1
-	do_servers_not_mgs $LCTL set_param nodemap.active=1
 	do_facet mgs $LCTL nodemap_modify --name default \
 		--property admin --value 1
 	do_facet mgs $LCTL nodemap_modify --name default \
 		--property trusted --value 1
-	do_servers_not_mgs $LCTL set_param nodemap.default.admin_nodemap=1
-	do_servers_not_mgs $LCTL set_param nodemap.default.trusted_nodemap=1
+	wait_nm_sync default trusted_nodemap
 }
 
 nodemap_test_cleanup() {
+	trap 0
 	delete_fops_nodemaps
 	rc=$?
 	[[ $rc != 0 ]] && error "removing fops nodemaps failed $rc"
 
+	do_facet mgs $LCTL nodemap_modify --name default \
+		 --property admin --value 0
+	do_facet mgs $LCTL nodemap_modify --name default \
+		 --property trusted --value 0
+	wait_nm_sync default trusted_nodemap
+
+	do_facet mgs $LCTL nodemap_activate 0
+	wait_nm_sync active 0
+
 	return 0
 }
 
@@ -1287,20 +1433,19 @@ nodemap_clients_admin_trusted() {
 	for client in $clients; do
 		do_facet mgs $LCTL nodemap_modify --name c0 \
 			--property admin --value $admin
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.admin_nodemap=$admin
 		do_facet mgs $LCTL nodemap_modify --name c0 \
 			--property trusted --value $tr
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.trusted_nodemap=$tr
 		i=$((i + 1))
 	done
+	wait_nm_sync c$((i - 1)) admin_nodemap
+	wait_nm_sync c$((i - 1)) trusted_nodemap
 }
 
 test_16() {
 	nodemap_version_check || return 0
 	nodemap_test_setup 0
 
+	trap nodemap_test_cleanup EXIT
 	test_fops all_off
 	nodemap_test_cleanup
 }
@@ -1310,6 +1455,7 @@ test_17() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
+	trap nodemap_test_cleanup EXIT
 	nodemap_clients_admin_trusted 0 1
 	test_fops trusted_noadmin 1
 	nodemap_test_cleanup
@@ -1319,6 +1465,8 @@ run_test 17 "test nodemap trusted_noadmin fileops"
 test_18() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
 	nodemap_clients_admin_trusted 0 0
 	test_fops mapped_noadmin 1
 	nodemap_test_cleanup
@@ -1328,6 +1476,8 @@ run_test 18 "test nodemap mapped_noadmin fileops"
 test_19() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
 	nodemap_clients_admin_trusted 1 1
 	test_fops trusted_admin 1
 	nodemap_test_cleanup
@@ -1337,6 +1487,8 @@ run_test 19 "test nodemap trusted_admin fileops"
 test_20() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
 	nodemap_clients_admin_trusted 1 0
 	test_fops mapped_admin 1
 	nodemap_test_cleanup
@@ -1346,6 +1498,8 @@ run_test 20 "test nodemap mapped_admin fileops"
 test_21() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
 	local x=1
 	local i=0
 	for client in $clients; do
@@ -1353,13 +1507,11 @@ test_21() {
 			--property admin --value 0
 		do_facet mgs $LCTL nodemap_modify --name c${i} \
 			--property trusted --value $x
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.admin_nodemap=0
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.trusted_nodemap=$x
 		x=0
 		i=$((i + 1))
 	done
+	wait_nm_sync c$((i - 1)) trusted_nodemap
+
 	test_fops mapped_trusted_noadmin
 	nodemap_test_cleanup
 }
@@ -1368,6 +1520,8 @@ run_test 21 "test nodemap mapped_trusted_noadmin fileops"
 test_22() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
 	local x=1
 	local i=0
 	for client in $clients; do
@@ -1375,13 +1529,11 @@ test_22() {
 			--property admin --value 1
 		do_facet mgs $LCTL nodemap_modify --name c${i} \
 			--property trusted --value $x
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.admin_nodemap=1
-		do_servers_not_mgs $LCTL set_param \
-			nodemap.c${i}.trusted_nodemap=$x
 		x=0
 		i=$((i + 1))
 	done
+	wait_nm_sync c$((i - 1)) trusted_nodemap
+
 	test_fops mapped_trusted_admin
 	nodemap_test_cleanup
 }
@@ -1391,12 +1543,13 @@ run_test 22 "test nodemap mapped_trusted_admin fileops"
 nodemap_acl_test_setup() {
 	local admin=$(do_facet mgs $LCTL get_param -n nodemap.c0.admin_nodemap)
 	local trust=$(do_facet mgs $LCTL get_param -n \
-		nodemap.c0.trusted_nodemap)
+		      nodemap.c0.trusted_nodemap)
 
 	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
 	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=1
+
+	wait_nm_sync c0 admin_nodemap
+	wait_nm_sync c0 trusted_nodemap
 
 	do_node ${clients_arr[0]} rm -rf $DIR/$tdir
 	nm_test_mkdir
@@ -1407,9 +1560,8 @@ nodemap_acl_test_setup() {
 		--property admin --value $admin
 	do_facet mgs $LCTL nodemap_modify --name c0 \
 		--property trusted --value $trust
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=$admin
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=$trust
 
+	wait_nm_sync c0 trusted_nodemap
 }
 
 # returns 0 if the number of ACLs does not change on the second (mapped) client
@@ -1453,6 +1605,7 @@ test_23() {
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
+	trap nodemap_test_cleanup EXIT
 	# 1 trusted cluster, 1 mapped cluster
 	local unmapped_fs=$((IDBASE+0))
 	local unmapped_c1=$((IDBASE+5))
@@ -1462,13 +1615,11 @@ test_23() {
 
 	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
 	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=1
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=1
 
 	do_facet mgs $LCTL nodemap_modify --name c1 --property admin --value 0
 	do_facet mgs $LCTL nodemap_modify --name c1 --property trusted --value 0
-	do_servers_not_mgs $LCTL set_param nodemap.c1.admin_nodemap=0
-	do_servers_not_mgs $LCTL set_param nodemap.c1.trusted_nodemap=0
+
+	wait_nm_sync c1 trusted_nodemap
 
 	# setfacl on trusted cluster to unmapped user, verify it's not seen
 	nodemap_acl_test $unmapped_fs ${clients_arr[0]} ${clients_arr[1]} ||
@@ -1489,8 +1640,8 @@ test_23() {
 	# 2 mapped clusters
 	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 0
 	do_facet mgs $LCTL nodemap_modify --name c0 --property trusted --value 0
-	do_servers_not_mgs $LCTL set_param nodemap.c0.admin_nodemap=0
-	do_servers_not_mgs $LCTL set_param nodemap.c0.trusted_nodemap=0
+
+	wait_nm_sync c0 trusted_nodemap
 
 	# setfacl to mapped user on c1, also mapped to c0, verify it's seen
 	nodemap_acl_test $mapped_c1 ${clients_arr[1]} ${clients_arr[0]} &&
@@ -1504,11 +1655,144 @@ test_23() {
 }
 run_test 23 "test mapped ACLs"
 
+test_24() {
+	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
+	do_nodes $(comma_list $(all_server_nodes)) $LCTL get_param -R nodemap ||
+		error "proc readable file read failed"
+
+	nodemap_test_cleanup
+}
+run_test 24 "check nodemap proc files for LBUGs and Oopses"
+
+test_25() {
+	local tmpfile=$(mktemp)
+	local tmpfile2=$(mktemp)
+	local subdir=c0dir
+
+	nodemap_version_check || return 0
+
+	# stop clients for this test
+	zconf_umount_clients $CLIENTS $MOUNT ||
+	    error "unable to umount clients $CLIENTS"
+
+	nodemap_test_setup
+
+	trap nodemap_test_cleanup EXIT
+
+	# create a new, empty nodemap, and add fileset info to it
+	do_facet mgs $LCTL nodemap_add test26 ||
+		error "unable to create nodemap test26"
+	do_facet mgs $LCTL set_param -P nodemap.test26.fileset=/$subdir ||
+		error "unable to add fileset info to nodemap test26"
+
+	wait_nm_sync test26 id
+
+	do_facet mgs $LCTL nodemap_info > $tmpfile
+	do_facet mds $LCTL nodemap_info > $tmpfile2
+
+	cleanup_and_setup_lustre
+	# stop clients for this test
+	zconf_umount_clients $CLIENTS $MOUNT ||
+	    error "unable to umount clients $CLIENTS"
+
+	diff -q <(do_facet mgs $LCTL nodemap_info) $tmpfile >& /dev/null ||
+		error "nodemap_info diff on MGS after remount"
+
+	diff -q <(do_facet mds $LCTL nodemap_info) $tmpfile2 >& /dev/null ||
+		error "nodemap_info diff on MDS after remount"
+
+	# cleanup nodemap
+	do_facet mgs $LCTL nodemap_del test26 ||
+	    error "cannot delete nodemap test26 from config"
+	nodemap_test_cleanup
+	# restart clients previously stopped
+	zconf_mount_clients $CLIENTS $MOUNT ||
+	    error "unable to mount clients $CLIENTS"
+
+	rm -f $tmpfile $tmpfile2
+}
+run_test 25 "test save and reload nodemap config"
+
+test_26() {
+	nodemap_version_check || return 0
+
+	local large_i=32000
+
+	do_facet mgs "seq -f 'c%g' $large_i | xargs -n1 $LCTL nodemap_add"
+	wait_nm_sync c$large_i admin_nodemap
+
+	do_facet mgs "seq -f 'c%g' $large_i | xargs -n1 $LCTL nodemap_del"
+	wait_nm_sync c$large_i admin_nodemap
+}
+run_test 26 "test transferring very large nodemap"
+
+test_27() {
+	local subdir=c0dir
+	local subsubdir=c0subdir
+
+	nodemap_test_setup
+	trap nodemap_test_cleanup EXIT
+
+	fileset_test_setup
+
+	# add fileset info to nodemap
+	do_facet mgs $LCTL set_param nodemap.c0.fileset=/$subdir ||
+		error "unable to set fileset info on nodemap c0"
+	do_facet mgs $LCTL set_param -P nodemap.c0.fileset=/$subdir ||
+		error "unable to add fileset info to nodemap c0"
+	wait_nm_sync c0 fileset
+
+	# re-mount client
+	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
+		error "unable to umount client ${clients_arr[0]}"
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "unable to remount client ${clients_arr[0]}"
+
+	# test mount point content
+	do_node ${clients_arr[0]} test -f $MOUNT/this_is_$subdir ||
+		error "fileset not taken into account"
+
+	# re-mount client with sub-subdir
+	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
+		error "unable to umount client ${clients_arr[0]}"
+	export FILESET=/$subsubdir
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "unable to remount client ${clients_arr[0]}"
+	unset FILESET
+
+	# test mount point content
+	do_node ${clients_arr[0]} test -f $MOUNT/this_is_$subsubdir ||
+		error "subdir of fileset not taken into account"
+
+	# remove fileset info from nodemap
+	do_facet mgs $LCTL nodemap_set_fileset --name c0 --fileset \'\' ||
+		error "unable to delete fileset info on nodemap c0"
+	do_facet mgs $LCTL set_param -P nodemap.c0.fileset=\'\' ||
+		error "unable to reset fileset info on nodemap c0"
+	wait_nm_sync c0 fileset
+
+	# re-mount client
+	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
+		error "unable to umount client ${clients_arr[0]}"
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "unable to remount client ${clients_arr[0]}"
+
+	# test mount point content
+	do_node ${clients_arr[0]} test -d $MOUNT/$subdir ||
+		error "fileset not cleared on nodemap c0"
+
+	fileset_test_cleanup
+	nodemap_test_cleanup
+}
+run_test 27 "test fileset in nodemap"
+
 log "cleanup: ======================================================"
 
 sec_unsetup() {
 	## nodemap deactivated
-	do_facet mgs lctl nodemap_activate 0
+	do_facet mgs $LCTL nodemap_activate 0
 
 	for num in $(seq $MDSCOUNT); do
 		if [ "${identity_old[$num]}" = 1 ]; then