X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-sec.sh;h=6344ebe54ab76a7912ca2ae589004179c9ebde58;hp=81e5594520afa1faeac45f1207aa12f16dc8ee1e;hb=a71586d4ee8d6f039a413e2a0fd791db847a3c19;hpb=a07c12ba823eb3af258b13372b21efa1134846ff

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 81e5594..6344ebe 100755
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -7,24 +7,20 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:
-ALWAYS_EXCEPT="              $SANITY_SEC_EXCEPT"
-if $SHARED_KEY; then
-# bug number for skipped test: 9145 9145 9671 9145 9145 9145 9145 9245
-	ALWAYS_EXCEPT="        17   18   19   20   21   22   23   27 $ALWAYS_EXCEPT"
-fi
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-
-SRCDIR=$(dirname $0)
-export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
-export NAME=${NAME:-local}
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
 init_logging
 
+ALWAYS_EXCEPT="$SANITY_SEC_EXCEPT "
+# bug number for skipped test:
+ALWAYS_EXCEPT+=" "
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"
+
 NODEMAP_TESTS=$(seq 7 26)
 
 if ! check_versions; then
@@ -32,10 +28,7 @@ if ! check_versions; then
 	EXCEPT="$EXCEPT $NODEMAP_TESTS"
 fi
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"
-
-[ "$ALWAYS_EXCEPT$EXCEPT$EXCEPT_SLOW" ] &&
-	echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT $EXCEPT_SLOW"
+build_test_filter
 
 RUNAS_CMD=${RUNAS_CMD:-runas}
 
@@ -44,13 +37,8 @@ WTL=${WTL:-"$LUSTRE/tests/write_time_limit"}
 CONFDIR=/etc/lustre
 PERM_CONF=$CONFDIR/perm.conf
 FAIL_ON_ERROR=false
-
 HOSTNAME_CHECKSUM=$(hostname | sum | awk '{ print $1 }')
 SUBNET_CHECKSUM=$(expr $HOSTNAME_CHECKSUM % 250 + 1)
-NODEMAP_COUNT=16
-NODEMAP_RANGE_COUNT=3
-NODEMAP_IPADDR_LIST="1 10 64 128 200 250"
-NODEMAP_MAX_ID=128
 
 require_dsh_mds || exit 0
 require_dsh_ost || exit 0
@@ -64,6 +52,12 @@ ID1=${ID1:-501}
 USER0=$(getent passwd | grep :$ID0:$ID0: | cut -d: -f1)
 USER1=$(getent passwd | grep :$ID1:$ID1: | cut -d: -f1)
 
+NODEMAP_COUNT=16
+NODEMAP_RANGE_COUNT=3
+NODEMAP_IPADDR_LIST="1 10 64 128 200 250"
+NODEMAP_ID_COUNT=10
+NODEMAP_MAX_ID=$((ID0 + NODEMAP_ID_COUNT))
+
 [ -z "$USER0" ] &&
 	skip "need to add user0 ($ID0:$ID0)" && exit 0
 
@@ -80,18 +74,7 @@ FOPS_IDMAPS=(
 
 check_and_setup_lustre
 
-sec_cleanup() {
-	if [ "$I_MOUNTED" = "yes" ]; then
-		cleanupall -f || error "sec_cleanup"
-	fi
-}
-
-DIR=${DIR:-$MOUNT}
-[ -z "$(echo $DIR | grep $MOUNT)" ] &&
-	error "$DIR not in $MOUNT" && sec_cleanup && exit 1
-
-[ $(echo $MOUNT | wc -w) -gt 1 ] &&
-	echo "NAME=$MOUNT mounted more than once" && sec_cleanup && exit 0
+assert_DIR
 
 # for GSS_SUP
 GSS_REF=$(lsmod | grep ^ptlrpc_gss | awk '{print $3}')
@@ -112,8 +95,6 @@ IDENTITY_UPCALL=mdt.$MDT.identity_upcall
 
 SAVE_PWD=$PWD
 
-build_test_filter
-
 sec_login() {
 	local user=$1
 	local group=$2
@@ -214,12 +195,10 @@ run_test 1 "setuid/gid ============================="
 # 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; }
+	[[ "$MDS1_VERSION" -ge $(version_code 2.6.93) ]] ||
+	[[ "$MDS1_VERSION" -ge $(version_code 2.5.35) &&
+	   "$MDS1_VERSION" -lt $(version_code 2.5.50) ]] ||
+		skip "Need MDS version at least 2.6.93 or 2.5.35"
 
 	rm -rf $DIR/$tdir
 	mkdir -p $DIR/$tdir
@@ -240,28 +219,37 @@ run_test 4 "set supplementary group ==============="
 
 create_nodemaps() {
 	local i
-	local out
 	local rc
 
 	squash_id default 99 0
+	wait_nm_sync default squash_uid '' inactive
 	squash_id default 99 1
+	wait_nm_sync default squash_gid '' inactive
 	for (( i = 0; i < NODEMAP_COUNT; i++ )); do
 		local csum=${HOSTNAME_CHECKSUM}_${i}
 
-		if ! do_facet mgs $LCTL nodemap_add $csum; then
-		       	return 1
+		do_facet mgs $LCTL nodemap_add $csum
+		rc=$?
+		if [ $rc -ne 0 ]; then
+			echo "nodemap_add $csum failed with $rc"
+			return $rc
 		fi
 
-		out=$(do_facet mgs $LCTL get_param nodemap.$csum.id)
-		## This needs to return zero if the following statement is 1
-		[[ $(echo $out | grep -c $csum) == 0 ]] && return 1
+		wait_update_facet --verbose mgs \
+			"$LCTL get_param nodemap.$csum.id 2>/dev/null | \
+			grep -c $csum || true" 1 30 ||
+		    return 1
+	done
+	for (( i = 0; i < NODEMAP_COUNT; i++ )); do
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		wait_nm_sync $csum id '' inactive
 	done
 	return 0
 }
 
 delete_nodemaps() {
 	local i
-	local out
 
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
 		local csum=${HOSTNAME_CHECKSUM}_${i}
@@ -271,8 +259,15 @@ delete_nodemaps() {
 			return 3
 		fi
 
-		out=$(do_facet mgs $LCTL get_param nodemap.$csum.id)
-		[[ $(echo $out | grep -c $csum) != 0 ]] && return 1
+		wait_update_facet --verbose mgs \
+			"$LCTL get_param nodemap.$csum.id 2>/dev/null | \
+			grep -c $csum || true" 0 30 ||
+		    return 1
+	done
+	for (( i = 0; i < NODEMAP_COUNT; i++ )); do
+		local csum=${HOSTNAME_CHECKSUM}_${i}
+
+		wait_nm_sync $csum id '' inactive
 	done
 	return 0
 }
@@ -313,10 +308,11 @@ add_idmaps() {
 	local cmd="$LCTL nodemap_add_idmap"
 	local rc=0
 
+	echo "Start to add idmaps ..."
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
 		local j
 
-		for ((j = 500; j < NODEMAP_MAX_ID; j++)); do
+		for ((j = $ID0; j < NODEMAP_MAX_ID; j++)); do
 			local csum=${HOSTNAME_CHECKSUM}_${i}
 			local client_id=$j
 			local fs_id=$((j + 1))
@@ -335,15 +331,84 @@ add_idmaps() {
 	return $rc
 }
 
+update_idmaps() { #LU-10040
+	[ "$MGS_VERSION" -lt $(version_code 2.10.55) ] &&
+		skip "Need MGS >= 2.10.55"
+
+	local csum=${HOSTNAME_CHECKSUM}_0
+	local old_id_client=$ID0
+	local old_id_fs=$((ID0 + 1))
+	local new_id=$((ID0 + 100))
+	local tmp_id
+	local cmd
+	local run
+	local idtype
+	local rc=0
+
+	echo "Start to update idmaps ..."
+
+	#Inserting an existed idmap should return error
+	cmd="$LCTL nodemap_add_idmap --name $csum --idtype uid"
+	if do_facet mgs \
+		$cmd --idmap $old_id_client:$old_id_fs 2>/dev/null; then
+		error "insert idmap {$old_id_client:$old_id_fs} " \
+			"should return error"
+		rc=$((rc + 1))
+		return rc
+	fi
+
+	#Update id_fs and check it
+	if ! do_facet mgs $cmd --idmap $old_id_client:$new_id; then
+		error "$cmd --idmap $old_id_client:$new_id failed"
+		rc=$((rc + 1))
+		return $rc
+	fi
+	tmp_id=$(do_facet mgs $LCTL get_param -n nodemap.$csum.idmap |
+		awk '{ print $7 }' | sed -n '2p')
+	[ $tmp_id != $new_id ] && { error "new id_fs $tmp_id != $new_id"; \
+		rc=$((rc + 1)); return $rc; }
+
+	#Update id_client and check it
+	if ! do_facet mgs $cmd --idmap $new_id:$new_id; then
+		error "$cmd --idmap $new_id:$new_id failed"
+		rc=$((rc + 1))
+		return $rc
+	fi
+	tmp_id=$(do_facet mgs $LCTL get_param -n nodemap.$csum.idmap |
+		awk '{ print $5 }' | sed -n "$((NODEMAP_ID_COUNT + 1)) p")
+	tmp_id=$(echo ${tmp_id%,*}) #e.g. "501,"->"501"
+	[ $tmp_id != $new_id ] && { error "new id_client $tmp_id != $new_id"; \
+		rc=$((rc + 1)); return $rc; }
+
+	#Delete above updated idmap
+	cmd="$LCTL nodemap_del_idmap --name $csum --idtype uid"
+	if ! do_facet mgs $cmd --idmap $new_id:$new_id; then
+		error "$cmd --idmap $new_id:$new_id failed"
+		rc=$((rc + 1))
+		return $rc
+	fi
+
+	#restore the idmaps to make delete_idmaps work well
+	cmd="$LCTL nodemap_add_idmap --name $csum --idtype uid"
+	if ! do_facet mgs $cmd --idmap $old_id_client:$old_id_fs; then
+		error "$cmd --idmap $old_id_client:$old_id_fs failed"
+		rc=$((rc + 1))
+		return $rc
+	fi
+
+	return $rc
+}
+
 delete_idmaps() {
 	local i
 	local cmd="$LCTL nodemap_del_idmap"
 	local rc=0
 
+	echo "Start to delete idmaps ..."
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
 		local j
 
-		for ((j = 500; j < NODEMAP_MAX_ID; j++)); do
+		for ((j = $ID0; j < NODEMAP_MAX_ID; j++)); do
 			local csum=${HOSTNAME_CHECKSUM}_${i}
 			local client_id=$j
 			local fs_id=$((j + 1))
@@ -390,9 +455,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
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
+
 	local cmd
 
 	cmd[0]="$LCTL nodemap_modify --property squash_uid"
@@ -403,9 +468,76 @@ 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
 squash_id default 99 1
+wait_nm_sync default squash_gid '' inactive
 
 test_nid() {
 	local cmd
@@ -421,16 +553,23 @@ test_nid() {
 	return 1
 }
 
+cleanup_active() {
+	# restore activation state
+	do_facet mgs $LCTL nodemap_activate 0
+	wait_nm_sync active
+}
+
 test_idmap() {
 	local i
 	local cmd="$LCTL nodemap_test_id"
 	local rc=0
 
+	echo "Start to test idmaps ..."
 	## nodemap deactivated
 	if ! do_facet mgs $LCTL nodemap_activate 0; then
 		return 1
 	fi
-	for ((id = 500; id < NODEMAP_MAX_ID; id++)); do
+	for ((id = $ID0; id < NODEMAP_MAX_ID; id++)); do
 		local j
 
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
@@ -449,7 +588,7 @@ test_idmap() {
 		return 2
 	fi
 
-	for ((id = 500; id < NODEMAP_MAX_ID; id++)); do
+	for ((id = $ID0; id < NODEMAP_MAX_ID; id++)); do
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
 			nid="$SUBNET_CHECKSUM.0.${j}.100@tcp"
 			fs_id=$(do_facet mgs $cmd --nid $nid	\
@@ -473,7 +612,7 @@ test_idmap() {
 		fi
 	done
 
-	for ((id = 500; id < NODEMAP_MAX_ID; id++)); do
+	for ((id = $ID0; id < NODEMAP_MAX_ID; id++)); do
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
 			nid="$SUBNET_CHECKSUM.0.${j}.100@tcp"
 			fs_id=$(do_facet mgs $cmd --nid $nid	\
@@ -545,18 +684,17 @@ test_idmap() {
 test_7() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	create_nodemaps
 	rc=$?
-	[[ $rc != 0 ]] && error "nodemap_add failed with $rc" && return 1
+	[[ $rc != 0 ]] && error "nodemap_add failed with $rc"
 
 	delete_nodemaps
 	rc=$?
-	[[ $rc != 0 ]] && error "nodemap_del failed with $rc" && return 2
+	[[ $rc != 0 ]] && error "nodemap_del failed with $rc"
 
 	return 0
 }
@@ -565,10 +703,9 @@ run_test 7 "nodemap create and delete"
 test_8() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	# Set up nodemaps
 
@@ -596,10 +733,9 @@ test_9() {
 	local i
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -634,10 +770,9 @@ run_test 9 "nodemap range add"
 test_10a() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -679,8 +814,8 @@ test_10a() {
 run_test 10a "nodemap reject duplicate ranges"
 
 test_10b() {
-	[ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] &&
-		skip "Need MGS >= 2.10.53" && return
+	[ "$MGS_VERSION" -lt $(version_code 2.10.53) ] &&
+		skip "Need MGS >= 2.10.53"
 
 	local nm1="nodemap1"
 	local nm2="nodemap2"
@@ -706,13 +841,72 @@ test_10b() {
 }
 run_test 10b "delete range from the correct nodemap"
 
+test_10c() { #LU-8912
+	[ "$MGS_VERSION" -lt $(version_code 2.10.57) ] &&
+		skip "Need MGS >= 2.10.57"
+
+	local nm="nodemap_lu8912"
+	local nid_range="10.210.[32-47].[0-255]@o2ib3"
+	local start_nid="10.210.32.0@o2ib3"
+	local end_nid="10.210.47.255@o2ib3"
+	local start_nid_found
+	local end_nid_found
+
+	do_facet mgs $LCTL nodemap_del $nm 2>/dev/null
+	do_facet mgs $LCTL nodemap_add $nm || error "Add $nm failed"
+	do_facet mgs $LCTL nodemap_add_range --name $nm --range $nid_range ||
+		error "Add range $nid_range to $nm failed"
+
+	start_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+		awk -F '[,: ]' /start_nid/'{ print $9 }')
+	[ "$start_nid" == "$start_nid_found" ] ||
+		error "start_nid: $start_nid_found != $start_nid"
+	end_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+		awk -F '[,: ]' /end_nid/'{ print $13 }')
+	[ "$end_nid" == "$end_nid_found" ] ||
+		error "end_nid: $end_nid_found != $end_nid"
+
+	do_facet mgs $LCTL nodemap_del $nm || error "Delete $nm failed"
+	return 0
+}
+run_test 10c "verfify contiguous range support"
+
+test_10d() { #LU-8913
+	[ "$MGS_VERSION" -lt $(version_code 2.10.59) ] &&
+		skip "Need MGS >= 2.10.59"
+
+	local nm="nodemap_lu8913"
+	local nid_range="*@o2ib3"
+	local start_nid="0.0.0.0@o2ib3"
+	local end_nid="255.255.255.255@o2ib3"
+	local start_nid_found
+	local end_nid_found
+
+	do_facet mgs $LCTL nodemap_del $nm 2>/dev/null
+	do_facet mgs $LCTL nodemap_add $nm || error "Add $nm failed"
+	do_facet mgs $LCTL nodemap_add_range --name $nm --range $nid_range ||
+		error "Add range $nid_range to $nm failed"
+
+	start_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+		awk -F '[,: ]' /start_nid/'{ print $9 }')
+	[ "$start_nid" == "$start_nid_found" ] ||
+		error "start_nid: $start_nid_found != $start_nid"
+	end_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+		awk -F '[,: ]' /end_nid/'{ print $13 }')
+	[ "$end_nid" == "$end_nid_found" ] ||
+		error "end_nid: $end_nid_found != $end_nid"
+
+	do_facet mgs $LCTL nodemap_del $nm || error "Delete $nm failed"
+	return 0
+}
+run_test 10d "verfify nodemap range format '*@<net>' support"
+
 test_11() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -739,10 +933,9 @@ run_test 11 "nodemap modify"
 test_12() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -777,10 +970,9 @@ run_test 12 "nodemap set squash ids"
 test_13() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -820,10 +1012,9 @@ run_test 13 "test nids"
 test_14() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -855,10 +1046,9 @@ run_test 14 "test default nodemap nid lookup"
 test_15() {
 	local rc
 
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
-		return
+	remote_mgs_nodsh && skip "remote MGS with nodsh"
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53"
 
 	rc=0
 	create_nodemaps
@@ -878,78 +1068,35 @@ test_15() {
 	rc=$?
 	[[ $rc != 0 ]] && error "nodemap_add_idmap failed with $rc" && return 3
 
+	activedefault=$(do_facet mgs $LCTL get_param -n nodemap.active)
+	if [[ "$activedefault" != "1" ]]; then
+		stack_trap cleanup_active EXIT
+	fi
+
 	rc=0
 	test_idmap
 	rc=$?
 	[[ $rc != 0 ]] && error "nodemap_test_id failed with $rc" && return 4
 
 	rc=0
+	update_idmaps
+	rc=$?
+	[[ $rc != 0 ]] && error "update_idmaps failed with $rc" && return 5
+
+	rc=0
 	delete_idmaps
 	rc=$?
-	[[ $rc != 0 ]] && error "nodemap_del_idmap failed with $rc" && return 5
+	[[ $rc != 0 ]] && error "nodemap_del_idmap failed with $rc" && return 6
 
 	rc=0
 	delete_nodemaps
 	rc=$?
-	[[ $rc != 0 ]] && error "nodemap_delete failed with $rc" && return 6
+	[[ $rc != 0 ]] && error "nodemap_delete failed with $rc" && return 7
 
 	return 0
 }
 run_test 15 "test id mapping"
 
-wait_nm_sync() {
-	local nodemap_name=$1
-	local key=$2
-	local value=$3
-	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=""
-	local out2
-	local mgs_ip=$(host_nids_address $mgs_HOST $NETTYPE | cut -d' ' -f1)
-	local i
-
-	if [ -z "$value" ]; then
-		out1=$(do_facet mgs $LCTL get_param nodemap.${proc_param})
-		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 \
-				   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"
-}
-
 create_fops_nodemaps() {
 	local i=0
 	local client
@@ -1028,6 +1175,12 @@ fops_test_setup() {
 # fileset test directory needs to be initialized on a privileged client
 fileset_test_setup() {
 	local nm=$1
+
+	if [ -n "$FILESET" -a -z "$SKIP_FILESET" ]; then
+		cleanup_mount $MOUNT
+		FILESET="" zconf_mount_clients $CLIENTS $MOUNT
+	fi
+
 	local admin=$(do_facet mgs $LCTL get_param -n \
 		nodemap.${nm}.admin_nodemap)
 	local trust=$(do_facet mgs $LCTL get_param -n \
@@ -1095,6 +1248,10 @@ fileset_test_cleanup() {
 
 	wait_nm_sync $nm admin_nodemap
 	wait_nm_sync $nm trusted_nodemap
+	if [ -n "$FILESET" -a -z "$SKIP_FILESET" ]; then
+		cleanup_mount $MOUNT
+		zconf_mount_clients $CLIENTS $MOUNT
+	fi
 }
 
 do_create_delete() {
@@ -1336,8 +1493,8 @@ test_fops() {
 
 nodemap_version_check () {
 	remote_mgs_nodsh && skip "remote MGS with nodsh" && return 1
-	[ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] &&
-		skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" &&
+	[ "$MGS_VERSION" -lt $(version_code 2.5.53) ] &&
+		skip "No nodemap on $MGS_VERSION MGS < 2.5.53" &&
 		return 1
 	return 0
 }
@@ -1361,6 +1518,7 @@ nodemap_test_setup() {
 
 	do_facet mgs $LCTL nodemap_modify --name default \
 		--property admin --value 1
+	wait_nm_sync default admin_nodemap
 	do_facet mgs $LCTL nodemap_modify --name default \
 		--property trusted --value 1
 	wait_nm_sync default trusted_nodemap
@@ -1374,6 +1532,7 @@ nodemap_test_cleanup() {
 
 	do_facet mgs $LCTL nodemap_modify --name default \
 		 --property admin --value 0
+	wait_nm_sync default admin_nodemap
 	do_facet mgs $LCTL nodemap_modify --name default \
 		 --property trusted --value 0
 	wait_nm_sync default trusted_nodemap
@@ -1411,6 +1570,11 @@ test_16() {
 run_test 16 "test nodemap all_off fileops"
 
 test_17() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1422,6 +1586,11 @@ test_17() {
 run_test 17 "test nodemap trusted_noadmin fileops"
 
 test_18() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1433,6 +1602,11 @@ test_18() {
 run_test 18 "test nodemap mapped_noadmin fileops"
 
 test_19() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1444,6 +1618,11 @@ test_19() {
 run_test 19 "test nodemap trusted_admin fileops"
 
 test_20() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1455,6 +1634,11 @@ test_20() {
 run_test 20 "test nodemap mapped_admin fileops"
 
 test_21() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1477,6 +1661,11 @@ test_21() {
 run_test 21 "test nodemap mapped_trusted_noadmin fileops"
 
 test_22() {
+	if $SHARED_KEY &&
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then
+		skip "Need MDS >= 2.11.55"
+	fi
+
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1562,6 +1751,7 @@ nodemap_acl_test() {
 }
 
 test_23a() {
+	[ $num_clients -lt 2 ] && skip "Need 2 clients at least" && return
 	nodemap_version_check || return 0
 	nodemap_test_setup
 
@@ -1616,10 +1806,11 @@ test_23a() {
 run_test 23a "test mapped regular ACLs"
 
 test_23b() { #LU-9929
-	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-	[ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] &&
-		skip "Need MGS >= 2.10.53" && return
+	[ $num_clients -lt 2 ] && skip "Need 2 clients at least"
+	[ "$MGS_VERSION" -lt $(version_code 2.10.53) ] &&
+		skip "Need MGS >= 2.10.53"
 
+	export SK_UNIQUE_NM=true
 	nodemap_test_setup
 	trap nodemap_test_cleanup EXIT
 
@@ -1631,37 +1822,40 @@ test_23b() { #LU-9929
 
 	do_facet mgs $LCTL nodemap_modify --name c0 --property admin --value 1
 	wait_nm_sync c0 admin_nodemap
+	do_facet mgs $LCTL nodemap_modify --name c1 --property admin --value 1
+	wait_nm_sync c1 admin_nodemap
+	do_facet mgs $LCTL nodemap_modify --name c1 --property trusted --value 1
+	wait_nm_sync c1 trusted_nodemap
 
 	# Add idmap $ID0:$fs_id (500:60010)
 	do_facet mgs $LCTL nodemap_add_idmap --name c0 --idtype gid \
 		--idmap $ID0:$fs_id ||
 		error "add idmap $ID0:$fs_id to nodemap c0 failed"
+	wait_nm_sync c0 idmap
 
-	# set/getfacl default acl on client0 (unmapped gid=500)
-	rm -rf $testdir
-	mkdir -p $testdir
+	# set/getfacl default acl on client 1 (unmapped gid=500)
+	do_node ${clients_arr[0]} rm -rf $testdir
+	do_node ${clients_arr[0]} mkdir -p $testdir
 	# Here, USER0=$(getent passwd | grep :$ID0:$ID0: | cut -d: -f1)
-	setfacl -R -d -m group:$USER0:rwx $testdir ||
+	do_node ${clients_arr[0]} setfacl -R -d -m group:$USER0:rwx $testdir ||
 		error "setfacl $testdir on ${clients_arr[0]} failed"
-	unmapped_id=$(getfacl $testdir | grep -E "default:group:.*:rwx" |
-			awk -F: '{print $3}')
+	unmapped_id=$(do_node ${clients_arr[0]} getfacl $testdir |
+			grep -E "default:group:.*:rwx" | awk -F: '{print $3}')
 	[ "$unmapped_id" = "$USER0" ] ||
 		error "gid=$ID0 was not unmapped correctly on ${clients_arr[0]}"
 
-	# getfacl default acl on MGS (mapped gid=60010)
-	zconf_mount $mgs_HOST $MOUNT
-	do_rpc_nodes $mgs_HOST is_mounted $MOUNT ||
-		error "mount lustre on MGS failed"
-	mapped_id=$(do_node $mgs_HOST getfacl $testdir |
+	# getfacl default acl on client 2 (mapped gid=60010)
+	mapped_id=$(do_node ${clients_arr[1]} getfacl $testdir |
 			grep -E "default:group:.*:rwx" | awk -F: '{print $3}')
-	fs_user=$(do_facet mgs getent passwd |
+	fs_user=$(do_node ${clients_arr[1]} getent passwd |
 			grep :$fs_id:$fs_id: | cut -d: -f1)
+	[ -z "$fs_user" ] && fs_user=$fs_id
 	[ $mapped_id -eq $fs_id -o "$mapped_id" = "$fs_user" ] ||
-		error "Should return gid=$fs_id or $fs_user on MGS"
+		error "Should return gid=$fs_id or $fs_user on client2"
 
 	rm -rf $testdir
-	do_facet mgs umount $MOUNT
 	nodemap_test_cleanup
+	export SK_UNIQUE_NM=false
 }
 run_test 23b "test mapped default ACLs"
 
@@ -1669,8 +1863,7 @@ 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"
+	do_nodes $(comma_list $(all_server_nodes)) $LCTL get_param -R nodemap
 
 	nodemap_test_cleanup
 }
@@ -1761,7 +1954,6 @@ run_test 26 "test transferring very large nodemap"
 
 nodemap_exercise_fileset() {
 	local nm="$1"
-	local fileset_on_mgs=""
 	local loop=0
 
 	# setup
@@ -1780,8 +1972,10 @@ nodemap_exercise_fileset() {
 	fileset_test_setup "$nm"
 
 	# add fileset info to $nm nodemap
-	do_facet mgs $LCTL set_param nodemap.${nm}.fileset=/$subdir ||
+	if ! combined_mgs_mds; then
+	    do_facet mgs $LCTL set_param nodemap.${nm}.fileset=/$subdir ||
 		error "unable to add fileset info to $nm nodemap on MGS"
+	fi
 	do_facet mgs $LCTL set_param -P nodemap.${nm}.fileset=/$subdir ||
 	       error "unable to add fileset info to $nm nodemap for servers"
 	wait_nm_sync $nm fileset "nodemap.${nm}.fileset=/$subdir"
@@ -1812,12 +2006,12 @@ nodemap_exercise_fileset() {
 		error "subdir of fileset not taken into account"
 
 	# remove fileset info from nodemap
-	do_facet mgs $LCTL nodemap_set_fileset --name $nm --fileset \'\' ||
+	do_facet mgs $LCTL nodemap_set_fileset --name $nm --fileset clear ||
 		error "unable to delete fileset info on $nm nodemap"
 	wait_update_facet mgs "$LCTL get_param nodemap.${nm}.fileset" \
 			  "nodemap.${nm}.fileset=" ||
 		error "fileset info still not cleared on $nm nodemap"
-	do_facet mgs $LCTL set_param -P nodemap.${nm}.fileset=\'\' ||
+	do_facet mgs $LCTL set_param -P nodemap.${nm}.fileset=clear ||
 		error "unable to reset fileset info on $nm nodemap"
 	wait_nm_sync $nm fileset "nodemap.${nm}.fileset="
 
@@ -1854,16 +2048,63 @@ nodemap_exercise_fileset() {
 	fi
 }
 
-test_27() {
+test_27a() {
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.50) ] &&
+		skip "Need MDS >= 2.11.50"
+
 	for nm in "default" "c0"; do
 		local subdir="subdir_${nm}"
 		local subsubdir="subsubdir_${nm}"
 
+		if [ "$nm" == "default" ] && [ "$SHARED_KEY" == "true" ]; then
+			echo "Skipping nodemap $nm with SHARED_KEY";
+			continue;
+		fi
+
 		echo "Exercising fileset for nodemap $nm"
 		nodemap_exercise_fileset "$nm"
 	done
 }
-run_test 27 "test fileset in various nodemaps"
+run_test 27a "test fileset in various nodemaps"
+
+test_27b() { #LU-10703
+	[ "$MDS1_VERSION" -lt $(version_code 2.11.50) ] &&
+		skip "Need MDS >= 2.11.50"
+	[[ $MDSCOUNT -lt 2 ]] && skip "needs >= 2 MDTs"
+
+	nodemap_test_setup
+	trap nodemap_test_cleanup EXIT
+
+	# Add the nodemaps and set their filesets
+	for i in $(seq 1 $MDSCOUNT); do
+		do_facet mgs $LCTL nodemap_del nm$i 2>/dev/null
+		do_facet mgs $LCTL nodemap_add nm$i ||
+			error "add nodemap nm$i failed"
+		wait_nm_sync nm$i "" "" "-N"
+
+		if ! combined_mgs_mds; then
+			do_facet mgs \
+				$LCTL set_param nodemap.nm$i.fileset=/dir$i ||
+				error "set nm$i.fileset=/dir$i failed on MGS"
+		fi
+		do_facet mgs $LCTL set_param -P nodemap.nm$i.fileset=/dir$i ||
+			error "set nm$i.fileset=/dir$i failed on servers"
+		wait_nm_sync nm$i fileset "nodemap.nm$i.fileset=/dir$i"
+	done
+
+	# Check if all the filesets are correct
+	for i in $(seq 1 $MDSCOUNT); do
+		fileset=$(do_facet mds$i \
+			  $LCTL get_param -n nodemap.nm$i.fileset)
+		[ "$fileset" = "/dir$i" ] ||
+			error "nm$i.fileset $fileset != /dir$i on mds$i"
+		do_facet mgs $LCTL nodemap_del nm$i ||
+			error "delete nodemap nm$i failed"
+	done
+
+	nodemap_test_cleanup
+}
+run_test 27b "The new nodemap won't clear the old nodemap's fileset"
 
 test_28() {
 	if ! $SHARED_KEY; then
@@ -1906,22 +2147,26 @@ test_29() {
 	touch $DIR/$tdir/$tfile || error "touch"
 	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
 		error "unable to umount clients"
-	keyctl show | awk '/lustre/ { print $1 }' |
-		xargs -IX keyctl unlink X
+	do_node ${clients_arr[0]} "keyctl show |
+		awk '/lustre/ { print \\\$1 }' | xargs -IX keyctl unlink X"
 	OLD_SK_PATH=$SK_PATH
 	export SK_PATH=/dev/null
 	if zconf_mount_clients ${clients_arr[0]} $MOUNT; then
 		export SK_PATH=$OLD_SK_PATH
-		if [ -e $DIR/$tdir/$tfile ]; then
+		do_node ${clients_arr[0]} "ls $DIR/$tdir/$tfile"
+		if [ $? -eq 0 ]; then
 			error "able to mount and read without key"
 		else
 			error "able to mount without key"
 		fi
 	else
 		export SK_PATH=$OLD_SK_PATH
-		keyctl show | awk '/lustre/ { print $1 }' |
-			xargs -IX keyctl unlink X
+		do_node ${clients_arr[0]} "keyctl show |
+			awk '/lustre/ { print \\\$1 }' |
+			xargs -IX keyctl unlink X"
 	fi
+	zconf_mount_clients ${clients_arr[0]} $MOUNT ||
+		error "unable to mount clients"
 }
 run_test 29 "check for missing shared key"
 
@@ -1937,46 +2182,1563 @@ test_30() {
 	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
 		error "unable to umount clients"
 	# unload keys from ring
-	keyctl show | awk '/lustre/ { print $1 }' |
-		xargs -IX keyctl unlink X
-	# invalidate the key with bogus filesystem name
-	lgss_sk -w $SK_PATH/$FSNAME-bogus.key -f $FSNAME.bogus \
-		-t client -d /dev/urandom || error "lgss_sk failed (1)"
+	do_node ${clients_arr[0]} "keyctl show |
+		awk '/lustre/ { print \\\$1 }' | xargs -IX keyctl unlink X"
+	# generate key with bogus filesystem name
+	do_node ${clients_arr[0]} "lgss_sk -w $SK_PATH/$FSNAME-bogus.key \
+		-f $FSNAME.bogus -t client -d /dev/urandom" ||
+		error "lgss_sk failed (1)"
 	do_facet $SINGLEMDS lfs flushctx || error "could not run flushctx"
 	OLD_SK_PATH=$SK_PATH
 	export SK_PATH=$SK_PATH/$FSNAME-bogus.key
 	if zconf_mount_clients ${clients_arr[0]} $MOUNT; then
 		SK_PATH=$OLD_SK_PATH
-		if [ -a $DIR/$tdir/$tdir.out ]; then
+		do_node ${clients_arr[0]} "ls $DIR/$tdir/$tdir.out"
+		if [ $? -eq 0 ]; then
 			error "mount and read file with invalid key"
 		else
 			error "mount with invalid key"
 		fi
 	fi
-	SK_PATH=$OLD_SK_PATH
 	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
 		error "unable to umount clients"
+	# unload keys from ring
+	do_node ${clients_arr[0]} "keyctl show |
+		awk '/lustre/ { print \\\$1 }' | xargs -IX keyctl unlink X"
+	rm -f $SK_PATH
+	SK_PATH=$OLD_SK_PATH
+	zconf_mount_clients ${clients_arr[0]} $MOUNT ||
+		error "unable to mount clients"
 }
 run_test 30 "check for invalid shared key"
 
-log "cleanup: ======================================================"
+basic_ios() {
+	local flvr=$1
 
-sec_unsetup() {
-	## nodemap deactivated
-	do_facet mgs $LCTL nodemap_activate 0
+	mkdir -p $DIR/$tdir || error "mkdir $flvr"
+	touch $DIR/$tdir/f0 || error "touch $flvr"
+	ls $DIR/$tdir || error "ls $flvr"
+	dd if=/dev/zero of=$DIR/$tdir/f0 conv=fsync bs=1M count=10 \
+		>& /dev/null || error "dd $flvr"
+	rm -f $DIR/$tdir/f0 || error "rm $flvr"
+	rmdir $DIR/$tdir || error "rmdir $flvr"
 
-	for num in $(seq $MDSCOUNT); do
-		if [ "${identity_old[$num]}" = 1 ]; then
-			switch_identity $num false || identity_old[$num]=$?
-		fi
+	sync ; sync
+	echo 3 > /proc/sys/vm/drop_caches
+}
+
+test_30b() {
+	local save_flvr=$SK_FLAVOR
+
+	if ! $SHARED_KEY; then
+		skip "need shared key feature for this test"
+	fi
+
+	stack_trap restore_to_default_flavor EXIT
+
+	for flvr in skn ska ski skpi; do
+		# set flavor
+		SK_FLAVOR=$flvr
+		restore_to_default_flavor || error "cannot set $flvr flavor"
+		SK_FLAVOR=$save_flvr
+
+		basic_ios $flvr
 	done
+}
+run_test 30b "basic test of all different SSK flavors"
 
-	$RUNAS_CMD -u $ID0 ls $DIR
-	$RUNAS_CMD -u $ID1 ls $DIR
+cleanup_31() {
+	# unmount client
+	zconf_umount $HOSTNAME $MOUNT || error "unable to umount client"
+
+	# remove ${NETTYPE}999 network on all nodes
+	do_nodes $(comma_list $(all_nodes)) \
+		 "$LNETCTL net del --net ${NETTYPE}999 && \
+		  $LNETCTL lnet unconfigure 2>/dev/null || true"
+
+	# necessary to do writeconf in order to de-register
+	# @${NETTYPE}999 nid for targets
+	KZPOOL=$KEEP_ZPOOL
+	export KEEP_ZPOOL="true"
+	stopall
+	export SK_MOUNTED=false
+	writeconf_all
+	setupall || echo 1
+	export KEEP_ZPOOL="$KZPOOL"
 }
-sec_unsetup
 
-sec_cleanup
+test_31() {
+	local nid=$(lctl list_nids | grep ${NETTYPE} | head -n1)
+	local addr=${nid%@*}
+	local net=${nid#*@}
+
+	export LNETCTL=$(which lnetctl 2> /dev/null)
+
+	[ -z "$LNETCTL" ] && skip "without lnetctl support." && return
+	local_mode && skip "in local mode."
+
+	stack_trap cleanup_31 EXIT
+
+	# umount client
+	if [ "$MOUNT_2" ] && $(grep -q $MOUNT2' ' /proc/mounts); then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	if $(grep -q $MOUNT' ' /proc/mounts); then
+		umount_client $MOUNT || error "umount $MOUNT failed"
+	fi
+
+	# check exports on servers are empty for client
+	do_facet mgs "lctl get_param -n *.MGS*.exports.'$nid'.uuid 2>/dev/null |
+		      grep -q -" && error "export on MGS should be empty"
+	do_nodes $(comma_list $(mdts_nodes) $(osts_nodes)) \
+		 "lctl get_param -n *.${FSNAME}*.exports.'$nid'.uuid \
+		  2>/dev/null | grep -q -" &&
+		error "export on servers should be empty"
+
+	# add network ${NETTYPE}999 on all nodes
+	do_nodes $(comma_list $(all_nodes)) \
+		 "$LNETCTL lnet configure && $LNETCTL net add --if \
+		  \$($LNETCTL net show --net $net | awk 'BEGIN{inf=0} \
+		  {if (inf==1) print \$2; fi; inf=0} /interfaces/{inf=1}') \
+		  --net ${NETTYPE}999" ||
+		error "unable to configure NID ${NETTYPE}999"
+
+	# necessary to do writeconf in order to register
+	# new @${NETTYPE}999 nid for targets
+	KZPOOL=$KEEP_ZPOOL
+	export KEEP_ZPOOL="true"
+	stopall
+	export SK_MOUNTED=false
+	writeconf_all
+	setupall server_only || echo 1
+	export KEEP_ZPOOL="$KZPOOL"
+
+	# backup MGSNID
+	local mgsnid_orig=$MGSNID
+	# compute new MGSNID
+	MGSNID=$(do_facet mgs "$LCTL list_nids | grep ${NETTYPE}999")
+
+	# on client, turn LNet Dynamic Discovery on
+	lnetctl set discovery 1
+
+	# mount client with -o network=${NETTYPE}999 option:
+	# should fail because of LNet Dynamic Discovery
+	mount_client $MOUNT ${MOUNT_OPTS},network=${NETTYPE}999 &&
+		error "client mount with '-o network' option should be refused"
+
+	# on client, reconfigure LNet and turn LNet Dynamic Discovery off
+	$LNETCTL net del --net ${NETTYPE}999 && lnetctl lnet unconfigure
+	lustre_rmmod
+	modprobe lnet
+	lnetctl set discovery 0
+	modprobe ptlrpc
+	$LNETCTL lnet configure && $LNETCTL net add --if \
+	  $($LNETCTL net show --net $net | awk 'BEGIN{inf=0} \
+	  {if (inf==1) print $2; fi; inf=0} /interfaces/{inf=1}') \
+	  --net ${NETTYPE}999 ||
+	error "unable to configure NID ${NETTYPE}999 on client"
+
+	# mount client with -o network=${NETTYPE}999 option
+	mount_client $MOUNT ${MOUNT_OPTS},network=${NETTYPE}999 ||
+		error "unable to remount client"
+
+	# restore MGSNID
+	MGSNID=$mgsnid_orig
+
+	# check export on MGS
+	do_facet mgs "lctl get_param -n *.MGS*.exports.'$nid'.uuid 2>/dev/null |
+		      grep -q -"
+	[ $? -ne 0 ] ||	error "export for $nid on MGS should not exist"
+
+	do_facet mgs \
+		"lctl get_param -n *.MGS*.exports.'${addr}@${NETTYPE}999'.uuid \
+		 2>/dev/null | grep -q -"
+	[ $? -eq 0 ] ||
+		error "export for ${addr}@${NETTYPE}999 on MGS should exist"
+
+	# check {mdc,osc} imports
+	lctl get_param mdc.${FSNAME}-*.import | grep current_connection |
+	    grep -q ${NETTYPE}999
+	[ $? -eq 0 ] ||
+		error "import for mdc should use ${addr}@${NETTYPE}999"
+	lctl get_param osc.${FSNAME}-*.import | grep current_connection |
+	    grep -q ${NETTYPE}999
+	[ $? -eq 0 ] ||
+		error "import for osc should use ${addr}@${NETTYPE}999"
+}
+run_test 31 "client mount option '-o network'"
+
+cleanup_32() {
+	# umount client
+	zconf_umount_clients ${clients_arr[0]} $MOUNT
+
+	# disable sk flavor enforcement on MGS
+	set_rule _mgs any any null
+
+	# stop gss daemon on MGS
+	if ! combined_mgs_mds ; then
+		send_sigint $mgs_HOST lsvcgssd
+	fi
+
+	# re-mount client
+	MOUNT_OPTS=$(add_sk_mntflag $MOUNT_OPTS)
+	mountcli
+
+	restore_to_default_flavor
+}
+
+test_32() {
+	if ! $SHARED_KEY; then
+		skip "need shared key feature for this test"
+	fi
+
+	stack_trap cleanup_32 EXIT
+
+	# restore to default null flavor
+	save_flvr=$SK_FLAVOR
+	SK_FLAVOR=null
+	restore_to_default_flavor || error "cannot set null flavor"
+	SK_FLAVOR=$save_flvr
+
+	# umount client
+	if [ "$MOUNT_2" ] && $(grep -q $MOUNT2' ' /proc/mounts); then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	if $(grep -q $MOUNT' ' /proc/mounts); then
+	umount_client $MOUNT || error "umount $MOUNT failed"
+	fi
+
+	# start gss daemon on MGS
+	if combined_mgs_mds ; then
+		send_sigint $mds_HOST lsvcgssd
+	fi
+	start_gss_daemons $mgs_HOST "$LSVCGSSD -vvv -s -g"
+
+	# add mgs key type and MGS NIDs in key on MGS
+	do_nodes $mgs_HOST "lgss_sk -t mgs,server -g $MGSNID -m \
+				$SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not modify keyfile on MGS"
+
+	# load modified key file on MGS
+	do_nodes $mgs_HOST "lgss_sk -l $SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not load keyfile on MGS"
+
+	# add MGS NIDs in key on client
+	do_nodes ${clients_arr[0]} "lgss_sk -g $MGSNID -m \
+				$SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not modify keyfile on MGS"
+
+	# set perms for per-nodemap keys else permission denied
+	do_nodes $(comma_list $(all_nodes)) \
+		 "keyctl show | grep lustre | cut -c1-11 |
+				sed -e 's/ //g;' |
+				xargs -IX keyctl setperm X 0x3f3f3f3f"
+
+	# re-mount client with mgssec=skn
+	save_opts=$MOUNT_OPTS
+	if [ -z "$MOUNT_OPTS" ]; then
+		MOUNT_OPTS="-o mgssec=skn"
+	else
+		MOUNT_OPTS="$MOUNT_OPTS,mgssec=skn"
+	fi
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "mount ${clients_arr[0]} with mgssec=skn failed"
+	MOUNT_OPTS=$save_opts
+
+	# umount client
+	zconf_umount_clients ${clients_arr[0]} $MOUNT ||
+		error "umount ${clients_arr[0]} failed"
+
+	# enforce ska flavor on MGS
+	set_rule _mgs any any ska
+
+	# re-mount client without mgssec
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS &&
+		error "mount ${clients_arr[0]} without mgssec should fail"
+
+	# re-mount client with mgssec=skn
+	save_opts=$MOUNT_OPTS
+	if [ -z "$MOUNT_OPTS" ]; then
+		MOUNT_OPTS="-o mgssec=skn"
+	else
+		MOUNT_OPTS="$MOUNT_OPTS,mgssec=skn"
+	fi
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS &&
+		error "mount ${clients_arr[0]} with mgssec=skn should fail"
+	MOUNT_OPTS=$save_opts
+
+	# re-mount client with mgssec=ska
+	save_opts=$MOUNT_OPTS
+	if [ -z "$MOUNT_OPTS" ]; then
+		MOUNT_OPTS="-o mgssec=ska"
+	else
+		MOUNT_OPTS="$MOUNT_OPTS,mgssec=ska"
+	fi
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "mount ${clients_arr[0]} with mgssec=ska failed"
+	MOUNT_OPTS=$save_opts
+
+	exit 0
+}
+run_test 32 "check for mgssec"
+
+cleanup_33() {
+	# disable sk flavor enforcement
+	set_rule $FSNAME any cli2mdt null
+	wait_flavor cli2mdt null
+
+	# umount client
+	zconf_umount_clients ${clients_arr[0]} $MOUNT
+
+	# stop gss daemon on MGS
+	if ! combined_mgs_mds ; then
+		send_sigint $mgs_HOST lsvcgssd
+	fi
+
+	# re-mount client
+	MOUNT_OPTS=$(add_sk_mntflag $MOUNT_OPTS)
+	mountcli
+
+	restore_to_default_flavor
+}
+
+test_33() {
+	if ! $SHARED_KEY; then
+		skip "need shared key feature for this test"
+	fi
+
+	stack_trap cleanup_33 EXIT
+
+	# restore to default null flavor
+	save_flvr=$SK_FLAVOR
+	SK_FLAVOR=null
+	restore_to_default_flavor || error "cannot set null flavor"
+	SK_FLAVOR=$save_flvr
+
+	# umount client
+	if [ "$MOUNT_2" ] && $(grep -q $MOUNT2' ' /proc/mounts); then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	if $(grep -q $MOUNT' ' /proc/mounts); then
+	umount_client $MOUNT || error "umount $MOUNT failed"
+	fi
+
+	# start gss daemon on MGS
+	if combined_mgs_mds ; then
+		send_sigint $mds_HOST lsvcgssd
+	fi
+	start_gss_daemons $mgs_HOST "$LSVCGSSD -vvv -s -g"
+
+	# add mgs key type and MGS NIDs in key on MGS
+	do_nodes $mgs_HOST "lgss_sk -t mgs,server -g $MGSNID -m \
+				$SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not modify keyfile on MGS"
+
+	# load modified key file on MGS
+	do_nodes $mgs_HOST "lgss_sk -l $SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not load keyfile on MGS"
+
+	# add MGS NIDs in key on client
+	do_nodes ${clients_arr[0]} "lgss_sk -g $MGSNID -m \
+				$SK_PATH/$FSNAME.key >/dev/null 2>&1" ||
+		error "could not modify keyfile on MGS"
+
+	# set perms for per-nodemap keys else permission denied
+	do_nodes $(comma_list $(all_nodes)) \
+		 "keyctl show | grep lustre | cut -c1-11 |
+				sed -e 's/ //g;' |
+				xargs -IX keyctl setperm X 0x3f3f3f3f"
+
+	# re-mount client with mgssec=skn
+	save_opts=$MOUNT_OPTS
+	if [ -z "$MOUNT_OPTS" ]; then
+		MOUNT_OPTS="-o mgssec=skn"
+	else
+		MOUNT_OPTS="$MOUNT_OPTS,mgssec=skn"
+	fi
+	zconf_mount_clients ${clients_arr[0]} $MOUNT $MOUNT_OPTS ||
+		error "mount ${clients_arr[0]} with mgssec=skn failed"
+	MOUNT_OPTS=$save_opts
+
+	# enforce ska flavor for cli2mdt
+	set_rule $FSNAME any cli2mdt ska
+	wait_flavor cli2mdt ska
+
+	# check error message
+	$LCTL dk | grep "faked source" &&
+		error "MGS connection srpc flags incorrect"
+
+	exit 0
+}
+run_test 33 "correct srpc flags for MGS connection"
+
+cleanup_34_deny() {
+	# restore deny_unknown
+	do_facet mgs $LCTL nodemap_modify --name default \
+			   --property deny_unknown --value $denydefault
+	if [ $? -ne 0 ]; then
+		error_noexit "cannot reset deny_unknown on default nodemap"
+		return
+	fi
+
+	wait_nm_sync default deny_unknown
+}
+
+test_34() {
+	local denynew
+	local activedefault
+
+	[ $MGS_VERSION -lt $(version_code 2.12.51) ] &&
+		skip "deny_unknown on default nm not supported before 2.12.51"
+
+	activedefault=$(do_facet mgs $LCTL get_param -n nodemap.active)
+
+	if [[ "$activedefault" != "1" ]]; then
+		do_facet mgs $LCTL nodemap_activate 1
+		wait_nm_sync active
+		stack_trap cleanup_active EXIT
+	fi
+
+	denydefault=$(do_facet mgs $LCTL get_param -n \
+		      nodemap.default.deny_unknown)
+	[ -z "$denydefault" ] &&
+		error "cannot get deny_unknown on default nodemap"
+	if [ "$denydefault" -eq 0 ]; then
+		denynew=1;
+	else
+		denynew=0;
+	fi
+
+	do_facet mgs $LCTL nodemap_modify --name default \
+			--property deny_unknown --value $denynew ||
+		error "cannot set deny_unknown on default nodemap"
+
+	[ "$(do_facet mgs $LCTL get_param -n nodemap.default.deny_unknown)" \
+			-eq $denynew ] ||
+		error "setting deny_unknown on default nodemap did not work"
+
+	stack_trap cleanup_34_deny EXIT
+
+	wait_nm_sync default deny_unknown
+}
+run_test 34 "deny_unknown on default nodemap"
+
+test_35() {
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.13.50) ] ||
+		skip "Need MDS >= 2.13.50"
+
+	# activate changelogs
+	changelog_register || error "changelog_register failed"
+	local cl_user="${CL_USERS[$SINGLEMDS]%% *}"
+	changelog_users $SINGLEMDS | grep -q $cl_user ||
+		error "User $cl_user not found in changelog_users"
+	changelog_chmask ALL
+
+	# do some IOs
+	mkdir $DIR/$tdir || error "failed to mkdir $tdir"
+	touch $DIR/$tdir/$tfile || error "failed to touch $tfile"
+
+	# access changelogs with root
+	changelog_dump || error "failed to dump changelogs"
+	changelog_clear 0 || error "failed to clear changelogs"
+
+	# put clients in non-admin nodemap
+	nodemap_test_setup
+	stack_trap nodemap_test_cleanup EXIT
+	for i in $(seq 0 $((num_clients-1))); do
+		do_facet mgs $LCTL nodemap_modify --name c${i} \
+			 --property admin --value 0
+	done
+	for i in $(seq 0 $((num_clients-1))); do
+		wait_nm_sync c${i} admin_nodemap
+	done
+
+	# access with mapped root
+	changelog_dump && error "dump changelogs should have failed"
+	changelog_clear 0 && error "clear changelogs should have failed"
+
+	exit 0
+}
+run_test 35 "Check permissions when accessing changelogs"
+
+setup_for_enc_tests() {
+	# remount client with test_dummy_encryption option
+	if is_mounted $MOUNT; then
+		umount_client $MOUNT || error "umount $MOUNT failed"
+	fi
+	mount_client $MOUNT ${MOUNT_OPTS},test_dummy_encryption ||
+		error "mount with '-o test_dummy_encryption' failed"
+
+	# this directory will be encrypted, because of dummy mode
+	mkdir $DIR/$tdir
+}
+
+cleanup_for_enc_tests() {
+	# remount client normally
+	if is_mounted $MOUNT; then
+		umount_client $MOUNT || error "umount $MOUNT failed"
+	fi
+	mount_client $MOUNT ${MOUNT_OPTS} ||
+		error "remount failed"
+
+	if is_mounted $MOUNT2; then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	if [ "$MOUNT_2" ]; then
+		mount_client $MOUNT2 ${MOUNT_OPTS} ||
+			error "remount failed"
+	fi
+}
+
+cleanup_nodemap_after_enc_tests() {
+	do_facet mgs $LCTL nodemap_modify --name default \
+		--property forbid_encryption --value 1
+	wait_nm_sync default forbid_encryption
+	do_facet mgs $LCTL nodemap_activate 0
+	wait_nm_sync active
+}
+
+test_36() {
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+
+	# first make sure it is possible to enable encryption
+	# when nodemap is not active
+	setup_for_enc_tests
+	rmdir $DIR/$tdir
+	umount_client $MOUNT || error "umount $MOUNT failed (1)"
+
+	# then activate nodemap, and retry
+	# should succeed as encryption is not forbidden on default nodemap
+	# by default
+	stack_trap cleanup_nodemap_after_enc_tests EXIT
+	do_facet mgs $LCTL nodemap_activate 1
+	wait_nm_sync active
+	forbid=$(do_facet mgs lctl get_param -n nodemap.default.forbid_encryption)
+	[ $forbid -eq 0 ] || error "wrong default value for forbid_encryption"
+	mount_client $MOUNT ${MOUNT_OPTS},test_dummy_encryption ||
+		error "mount '-o test_dummy_encryption' failed with default"
+	umount_client $MOUNT || error "umount $MOUNT failed (2)"
+
+	# then forbid encryption, and retry
+	do_facet mgs $LCTL nodemap_modify --name default \
+		--property forbid_encryption --value 1
+	wait_nm_sync default forbid_encryption
+	mount_client $MOUNT ${MOUNT_OPTS},test_dummy_encryption &&
+		error "mount '-o test_dummy_encryption' should have failed"
+	return 0
+}
+run_test 36 "control if clients can use encryption"
+
+test_37() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local objdump=$TMP/objdump
+	local objid
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	[ "$ost1_FSTYPE" = ldiskfs ] || skip "ldiskfs only test (using debugfs)"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# write a few bytes in file
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=$tmpfile of=$testfile bs=4 count=1 conv=fsync
+	do_facet ost1 "sync; sync"
+
+	# check that content on ost is encrypted
+	objid=$($LFS getstripe $testfile | awk '/obdidx/{getline; print $2}')
+	do_facet ost1 "$DEBUGFS -c -R 'cat O/0/d$(($objid % 32))/$objid' \
+		 $(ostdevname 1)" > $objdump
+	cmp -s $objdump $tmpfile &&
+		error "file $testfile is not encrypted on ost"
+
+	# check that in-memory representation of file is correct
+	cmp -bl ${tmpfile} ${testfile} ||
+		error "file $testfile is corrupted in memory"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl ${tmpfile} ${testfile} ||
+		error "file $testfile is corrupted on server"
+
+	rm -f $tmpfile $objdump
+}
+run_test 37 "simple encrypted file"
+
+test_38() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local objid
+	local blksz
+	local srvsz=0
+	local filesz
+	local bsize
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# get block size on ost
+	blksz=$($LCTL get_param osc.$FSNAME*.import |
+		awk '/grant_block_size:/ { print $2; exit; }')
+	# write a few bytes in file at offset $blksz
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$blksz \
+		oflag=seek_bytes conv=fsync
+
+	# check that in-memory representation of file is correct
+	bsize=$(stat --format=%B $testfile)
+	filesz=$(stat --format=%b $testfile)
+	filesz=$((filesz*bsize))
+	[ $filesz -le $blksz ] ||
+		error "file $testfile is $filesz long in memory"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	bsize=$(stat --format=%B $testfile)
+	filesz=$(stat --format=%b $testfile)
+	filesz=$((filesz*bsize))
+	[ $filesz -le $blksz ] ||
+		error "file $testfile is $filesz long on server"
+
+	rm -f $tmpfile
+}
+run_test 38 "encrypted file with hole"
+
+test_39() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# write a few bytes in file
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=$tmpfile of=$testfile bs=4 count=1 conv=fsync
+
+	# write a few more bytes in the same page
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=1024 oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	dd if=$tmpfile of=$tmpfile bs=4 count=1 seek=1024 oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server"
+
+	rm -f $tmpfile
+}
+run_test 39 "rewrite data in already encrypted page"
+
+test_40() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local tmpfile2=$TMP/abc2
+	local seek
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	[[ $OSTCOUNT -lt 2 ]] && skip_env "needs >= 2 OSTs"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# write a few bytes in file
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=$tmpfile of=$testfile bs=4 count=1 conv=fsync
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory (1)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server (1)"
+
+	# write a few other bytes in same page
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=256 oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	dd if=$tmpfile of=$tmpfile bs=4 count=1 seek=256 oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory (2)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server (2)"
+
+	rm -f $testfile $tmpfile
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# write a few bytes in file, at end of first page
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	seek=$(getconf PAGESIZE)
+	seek=$((seek - 4))
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# write a few other bytes at beginning of first page
+	dd if=$tmpfile of=$testfile bs=4 count=1 conv=fsync,notrunc
+
+	dd if=$tmpfile of=$tmpfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory (3)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server (3)"
+
+	rm -f $testfile $tmpfile
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# write a few bytes in file, at beginning of second page
+	echo "abc" > $tmpfile
+	$LFS setstripe -c1 -i0 $testfile
+	seek=$(getconf PAGESIZE)
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# write a few other bytes at end of first page
+	seek=$((seek - 4))
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted in memory (4)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted on server (4)"
+
+	rm -f $testfile $tmpfile $tmpfile2
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# write a few bytes in file, at beginning of first stripe
+	echo "abc" > $tmpfile
+	$LFS setstripe -S 256k -c2 $testfile
+	dd if=$tmpfile of=$testfile bs=4 count=1 conv=fsync,notrunc
+
+	# write a few other bytes, at beginning of second stripe
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=262144 oflag=seek_bytes \
+		conv=fsync,notrunc
+	dd if=$tmpfile of=$tmpfile bs=4 count=1 seek=262144 oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory (5)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server (5)"
+
+	rm -f $tmpfile
+}
+run_test 40 "exercise size of encrypted file"
+
+test_41() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local tmpfile2=$TMP/abc2
+	local seek
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	echo "abc" > $tmpfile
+	seek=$(getconf PAGESIZE)
+	seek=$((seek - 204))
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync
+	seek=$(getconf PAGESIZE)
+	seek=$((seek + 1092))
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# write a few bytes in file
+	$LFS setstripe -c1 -i0 -S 256k $testfile
+	seek=$(getconf PAGESIZE)
+	seek=$((seek - 204))
+	#define OBD_FAIL_OST_WR_ATTR_DELAY	 0x250
+	do_facet ost1 "$LCTL set_param fail_loc=0x250 fail_val=15"
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync &
+
+	sleep 5
+	# write a few other bytes, at a different offset
+	seek=$(getconf PAGESIZE)
+	seek=$((seek + 1092))
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc &
+	wait
+	do_facet ost1 "$LCTL set_param fail_loc=0x0"
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted in memory (1)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted on server (1)"
+
+	rm -f $tmpfile $tmpfile2
+}
+run_test 41 "test race on encrypted file size (1)"
+
+test_42() {
+	local testfile=$DIR/$tdir/$tfile
+	local testfile2=$DIR2/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local tmpfile2=$TMP/abc2
+	local pagesz=$(getconf PAGESIZE)
+	local seek
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	if is_mounted $MOUNT2; then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	mount_client $MOUNT2 ${MOUNT_OPTS},test_dummy_encryption ||
+		error "mount2 with '-o test_dummy_encryption' failed"
+
+	# create file by writting one whole page
+	$LFS setstripe -c1 -i0 -S 256k $testfile
+	dd if=/dev/zero of=$testfile bs=$pagesz count=1 conv=fsync
+
+	# read file from 2nd mount point
+	cat $testfile2 > /dev/null
+
+	echo "abc" > $tmpfile
+	dd if=/dev/zero of=$tmpfile2 bs=$pagesz count=1 conv=fsync
+	seek=$((2*pagesz - 204))
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	seek=$((2*pagesz + 1092))
+	dd if=$tmpfile of=$tmpfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+
+	# write a few bytes in file from 1st mount point
+	seek=$((2*pagesz - 204))
+	#define OBD_FAIL_OST_WR_ATTR_DELAY	 0x250
+	do_facet ost1 "$LCTL set_param fail_loc=0x250 fail_val=15"
+	dd if=$tmpfile of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc &
+
+	sleep 5
+	# write a few other bytes, at a different offset from 2nd mount point
+	seek=$((2*pagesz + 1092))
+	dd if=$tmpfile of=$testfile2 bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc &
+	wait
+	do_facet ost1 "$LCTL set_param fail_loc=0x0"
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted in memory (1)"
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile2 $testfile2 ||
+		error "file $testfile is corrupted in memory (2)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile2 $testfile ||
+		error "file $testfile is corrupted on server (1)"
+
+	rm -f $tmpfile $tmpfile2
+}
+run_test 42 "test race on encrypted file size (2)"
+
+test_43() {
+	local testfile=$DIR/$tdir/$tfile
+	local testfile2=$DIR2/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local tmpfile2=$TMP/abc2
+	local resfile=$TMP/res
+	local pagesz=$(getconf PAGESIZE)
+	local seek
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	if is_mounted $MOUNT2; then
+		umount_client $MOUNT2 || error "umount $MOUNT2 failed"
+	fi
+	mount_client $MOUNT2 ${MOUNT_OPTS},test_dummy_encryption ||
+		error "mount2 with '-o test_dummy_encryption' failed"
+
+	# create file
+	tr '\0' '1' < /dev/zero |
+		dd of=$tmpfile bs=$pagesz count=1 conv=fsync
+	$LFS setstripe -c1 -i0 -S 256k $testfile
+	cp $tmpfile $testfile
+
+	# read file from 2nd mount point
+	cat $testfile2 > /dev/null
+
+	# write a few bytes in file from 1st mount point
+	echo "abc" > $tmpfile2
+	seek=$((2*pagesz - 204))
+	#define OBD_FAIL_OST_WR_ATTR_DELAY	 0x250
+	do_facet ost1 "$LCTL set_param fail_loc=0x250 fail_val=15"
+	dd if=$tmpfile2 of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc &
+
+	sleep 5
+	# read file from 2nd mount point
+	dd if=$testfile2 of=$resfile bs=$pagesz count=1 conv=fsync,notrunc
+	cmp -bl $tmpfile $resfile ||
+		error "file $testfile is corrupted in memory (1)"
+
+	wait
+	do_facet ost1 "$LCTL set_param fail_loc=0x0"
+
+	# check that in-memory representation of file is correct
+	dd if=$tmpfile2 of=$tmpfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	cmp -bl $tmpfile $testfile2 ||
+		error "file $testfile is corrupted in memory (2)"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server (1)"
+
+	rm -f $tmpfile $tmpfile2
+}
+run_test 43 "test race on encrypted file size (3)"
+
+test_44() {
+	local testfile=$DIR/$tdir/$tfile
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	which vmtouch || skip "This test needs vmtouch utility"
+
+	# Direct I/O is not supported on encrypted files.
+	# Attempts to use direct I/O on such files should fall back to
+	# buffered I/O.
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# write a page in file with O_DIRECT
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=/dev/urandom of=$testfile bs=4096 count=1 conv=fsync oflag=direct
+
+	respage=$(vmtouch $testfile | awk '/Resident\ Pages:/ {print $3}')
+	[ "$respage" == "1/1" ] ||
+		error "write to enc file did not fall back to buffered IO"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	dd if=$testfile of=/dev/null bs=4096 count=1 iflag=direct
+
+	respage=$(vmtouch $testfile | awk '/Resident\ Pages:/ {print $3}')
+	[ "$respage" == "1/1" ] ||
+		error "write to enc file did not fall back to buffered IO"
+}
+run_test 44 "encrypted file access semantics: direct IO"
+
+test_45() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/junk
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	$LFS setstripe -c1 -i0 $testfile
+	dd if=/dev/zero of=$testfile bs=512K count=1
+	$MULTIOP $testfile OSMRUc || error "$MULTIOP $testfile failed (1)"
+	$MULTIOP $testfile OSMWUc || error "$MULTIOP $testfile failed (2)"
+
+	dd if=/dev/zero of=$tmpfile bs=512K count=1
+	$MULTIOP $tmpfile OSMWUc || error "$MULTIOP $tmpfile failed"
+	$MMAP_CAT $tmpfile > ${tmpfile}2
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	$MMAP_CAT $testfile > ${testfile}2
+	cmp -bl ${tmpfile}2 ${testfile}2 ||
+		error "file $testfile is corrupted"
+
+	rm -f $tmpfile ${tmpfile}2
+}
+run_test 45 "encrypted file access semantics: MMAP"
+
+test_46() {
+	local testdir=$DIR/$tdir/mydir
+	local testfile=$testdir/myfile
+	local lsfile=$TMP/lsfile
+	local scrambleddir
+	local scrambledfile
+
+	local testfile2=$DIR/$tdir/${tfile}.2
+	local tmpfile=$DIR/junk
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	touch $DIR/onefile
+	touch $DIR/$tdir/$tfile
+	mkdir $testdir
+	echo test > $testfile
+	sync ; echo 3 > /proc/sys/vm/drop_caches
+
+	# remove fscrypt key from keyring
+	keyctl revoke $(keyctl show | awk '$7 ~ "^fscrypt:" {print $1}')
+	keyctl reap
+
+	scrambleddir=$(find $DIR/$tdir/ -maxdepth 1 -mindepth 1 -type d)
+	ls -1 $scrambleddir > $lsfile || error "ls $testdir failed"
+
+	scrambledfile=$scrambleddir/$(head -n 1 $lsfile)
+	stat $scrambledfile || error "stat $scrambledfile failed"
+	rm -f $lsfile
+
+	cat $scrambledfile && error "cat $scrambledfile should have failed"
+
+	touch $scrambleddir/otherfile &&
+		error "touch otherfile should have failed"
+	ls $scrambleddir/otherfile && error "otherfile should not exist"
+	mkdir $scrambleddir/otherdir &&
+		error "mkdir otherdir should have failed"
+	ls -d $scrambleddir/otherdir && error "otherdir should not exist"
+
+	rm -f $scrambledfile || error "rm $scrambledfile failed"
+	rmdir $scrambleddir || error "rmdir $scrambleddir failed"
+
+	rm -f $DIR/onefile
+}
+run_test 46 "encrypted file access semantics without key"
+
+test_47() {
+	local testfile=$DIR/$tdir/$tfile
+	local testfile2=$DIR/$tdir/${tfile}.2
+	local tmpfile=$DIR/junk
+	local scrambleddir
+	local scrambledfile
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	dd if=/dev/zero of=$tmpfile bs=512K count=1
+	mrename $tmpfile $testfile &&
+		error "rename from unencrypted to encrypted dir should fail"
+
+	ln $tmpfile $testfile &&
+		error "link from unencrypted to encrypted dir should fail"
+
+	cp $tmpfile $testfile ||
+		error "cp from unencrypted to encrypted dir should succeed"
+	rm -f $tmpfile
+
+	mrename $testfile $testfile2 ||
+		error "rename from within encrypted dir should succeed"
+
+	ln $testfile2 $testfile ||
+		error "link from within encrypted dir should succeed"
+	rm -f $testfile
+
+	ln $testfile2 $tmpfile ||
+		error "link from encrypted to unencrypted dir should succeed"
+	rm -f $tmpfile
+
+	mrename $testfile2 $tmpfile ||
+		error "rename from encrypted to unencrypted dir should succeed"
+
+	dd if=/dev/zero of=$testfile bs=512K count=1
+	mkdir $DIR/$tdir/mydir
+	sync ; echo 3 > /proc/sys/vm/drop_caches
+
+	# remove fscrypt key from keyring
+	keyctl revoke $(keyctl show | awk '$7 ~ "^fscrypt:" {print $1}')
+	keyctl reap
+
+	scrambleddir=$(find $DIR/$tdir/ -maxdepth 1 -mindepth 1 -type d)
+	scrambledfile=$(find $DIR/$tdir/ -maxdepth 1 -type f)
+	ln $scrambledfile $scrambleddir/linkfile &&
+		error "ln linkfile should have failed"
+	mrename $scrambledfile $DIR/onefile2 &&
+		error "mrename from $scrambledfile should have failed"
+	touch $DIR/onefile
+	mrename $DIR/onefile $scrambleddir/otherfile &&
+		error "mrename to $scrambleddir should have failed"
+
+	rm -f $tmpfile $DIR/onefile
+}
+run_test 47 "encrypted file access semantics: rename/link"
+
+test_48a() {
+	local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/111
+	local tmpfile2=$TMP/abc
+	local pagesz=$(getconf PAGESIZE)
+	local sz
+	local seek
+	local scrambledfile
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# create file, 4 x PAGE_SIZE long
+	tr '\0' '1' < /dev/zero |
+		dd of=$tmpfile bs=4x$pagesz count=1 conv=fsync
+	$LFS setstripe -c1 -i0 $testfile
+	cp $tmpfile $testfile
+	echo "abc" > $tmpfile2
+
+	# decrease size: truncate to PAGE_SIZE
+	$TRUNCATE $tmpfile $pagesz
+	$TRUNCATE $testfile $pagesz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (1)"
+
+	# increase size: truncate to 2 x PAGE_SIZE
+	sz=$((pagesz*2))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (2)"
+
+	# write in 2nd page
+	seek=$((pagesz+100))
+	dd if=$tmpfile2 of=$tmpfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	dd if=$tmpfile2 of=$testfile bs=4 count=1 seek=$seek oflag=seek_bytes \
+		conv=fsync,notrunc
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (3)"
+
+	# truncate to PAGE_SIZE / 2
+	sz=$((pagesz/2))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (4)"
+
+	# lockless truncate should be turned into regular truncate for enc file
+	save_lustre_params client "osc.*.lockless_truncate" > $save
+	# restore lockless_truncate default values on exit
+	stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	lctl set_param -n osc.*.lockless_truncate 1
+	cancel_lru_locks osc
+	clear_stats osc.*.osc_stats
+	$TRUNCATE $testfile 8000000 || error "truncate failed (1)"
+	[ $(calc_stats osc.*.osc_stats lockless_truncate) -eq 0 ] ||
+		error "lockless truncate should be turned into regular truncate"
+	lctl set_param -n osc.*.lockless_truncate 0
+
+	# truncate to a smaller, non-multiple of PAGE_SIZE, non-multiple of 16
+	sz=$((sz-7))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (5)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, non-multiple of 16
+	sz=$((sz+18))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (6)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, in a different page
+	sz=$((sz+pagesz+30))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (7)"
+
+	sync ; echo 3 > /proc/sys/vm/drop_caches
+
+	# remove fscrypt key from keyring
+	keyctl revoke $(keyctl show | awk '$7 ~ "^fscrypt:" {print $1}')
+	keyctl reap
+
+	scrambledfile=$(find $DIR/$tdir/ -maxdepth 1 -type f)
+	$TRUNCATE $scrambledfile 0 &&
+		error "truncate $scrambledfile should have failed without key"
+
+	rm -f $tmpfile $tmpfile2
+}
+run_test 48a "encrypted file access semantics: truncate"
+
+cleanup_for_enc_tests_othercli() {
+	local othercli=$1
+
+	# remount othercli normally
+	zconf_umount $othercli $MOUNT ||
+		error "umount $othercli $MOUNT failed"
+	zconf_mount $othercli $MOUNT ||
+		error "remount $othercli $MOUNT failed"
+}
+
+test_48b() {
+	local othercli
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	[ "$num_clients" -ge 2 ] || skip "Need at least 2 clients"
+
+	if [ "$HOSTNAME" == ${clients_arr[0]} ]; then
+		othercli=${clients_arr[1]}
+	else
+		othercli=${clients_arr[0]}
+	fi
+
+	stack_trap cleanup_for_enc_tests EXIT
+	stack_trap "cleanup_for_enc_tests_othercli $othercli" EXIT
+	setup_for_enc_tests
+	zconf_umount $othercli $MOUNT ||
+		error "umount $othercli $MOUNT failed"
+
+	cp /bin/sleep $DIR/$tdir/
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	$DIR/$tdir/sleep 30 &
+	# mount and IOs must be done in the same shell session, otherwise
+	# encryption key in session keyring is missing
+	do_node $othercli "$MOUNT_CMD -o ${MOUNT_OPTS},test_dummy_encryption \
+			   $MGSNID:/$FSNAME $MOUNT && \
+			   $TRUNCATE $DIR/$tdir/sleep 7"
+	wait || error "wait error"
+	cmp --silent /bin/sleep $DIR/$tdir/sleep ||
+		error "/bin/sleep and $DIR/$tdir/sleep differ"
+}
+run_test 48b "encrypted file: concurrent truncate"
+
+trace_cmd() {
+	local cmd="$@"
+	local xattr_name="security.c"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	$LCTL set_param debug=+info
+	$LCTL clear
+
+	echo $cmd
+	eval $cmd
+
+	$LCTL dk | grep -E "get xattr '${xattr_name}'|get xattrs"
+	[ $? -ne 0 ] || error "get xattr event was triggered"
+}
+
+test_49() {
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	local dirname=$DIR/$tdir/subdir
+
+	mkdir $dirname
+
+	trace_cmd stat $dirname
+	trace_cmd touch $dirname/f1
+	trace_cmd stat $dirname/f1
+	trace_cmd cat $dirname/f1
+	dd if=/dev/zero of=$dirname/f1 bs=1M count=10 conv=fsync
+	trace_cmd $TRUNCATE $dirname/f1 10240
+	trace_cmd $LFS setstripe -E -1 -S 4M $dirname/f2
+	trace_cmd $LFS migrate -E -1 -S 256K $dirname/f2
+	trace_cmd $LFS setdirstripe -i 1 $dirname/d2
+	trace_cmd $LFS migrate -m 0 $dirname/d2
+
+	$LFS setdirstripe -i 1 -c 1 $dirname/d3
+	dirname=$dirname/d3/subdir
+	mkdir $dirname
+
+	trace_cmd stat $dirname
+	trace_cmd touch $dirname/f1
+	trace_cmd stat $dirname/f1
+	trace_cmd cat $dirname/f1
+	dd if=/dev/zero of=$dirname/f1 bs=1M count=10 conv=fsync
+	trace_cmd $TRUNCATE $dirname/f1 10240
+	trace_cmd $LFS setstripe -E -1 -S 4M $dirname/f2
+	trace_cmd $LFS migrate -E -1 -S 256K $dirname/f2
+}
+run_test 49 "Avoid getxattr for encryption context"
+
+test_50() {
+	local testfile=$DIR/$tdir/$tfile
+	local tmpfile=$TMP/abc
+	local pagesz=$(getconf PAGESIZE)
+	local sz
+
+	$LCTL get_param mdc.*.import | grep -q client_encryption ||
+		skip "client encryption not supported"
+
+	mount.lustre --help |& grep -q "test_dummy_encryption:" ||
+		skip "need dummy encryption support"
+
+	stack_trap cleanup_for_enc_tests EXIT
+	setup_for_enc_tests
+
+	# write small file, data on MDT only
+	tr '\0' '1' < /dev/zero |
+	    dd of=$tmpfile bs=1 count=5000 conv=fsync
+	$LFS setstripe -E 1M -L mdt -E EOF $testfile
+	cp $tmpfile $testfile
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server"
+
+	# decrease size: truncate to PAGE_SIZE
+	$TRUNCATE $tmpfile $pagesz
+	$TRUNCATE $testfile $pagesz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (1)"
+
+	# increase size: truncate to 2 x PAGE_SIZE
+	sz=$((pagesz*2))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (2)"
+
+	# truncate to PAGE_SIZE / 2
+	sz=$((pagesz/2))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (3)"
+
+	# truncate to a smaller, non-multiple of PAGE_SIZE, non-multiple of 16
+	sz=$((sz-7))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (4)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, non-multiple of 16
+	sz=$((sz+18))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (5)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, in a different page
+	sz=$((sz+pagesz+30))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (6)"
+
+	rm -f $testfile
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# write hole in file, data spread on MDT and OST
+	tr '\0' '2' < /dev/zero |
+	    dd of=$tmpfile bs=1 count=1539 seek=1539074 conv=fsync,notrunc
+	$LFS setstripe -E 1M -L mdt -E EOF $testfile
+	cp --sparse=always $tmpfile $testfile
+
+	# check that in-memory representation of file is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted in memory"
+
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+
+	# check that file read from server is correct
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted on server"
+
+	# truncate to a smaller, non-multiple of PAGE_SIZE, non-multiple of 16,
+	# inside OST part of data
+	sz=$((1024*1024+13))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (7)"
+
+	# truncate to a smaller, non-multiple of PAGE_SIZE, non-multiple of 16,
+	# inside MDT part of data
+	sz=7
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (8)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, non-multiple of 16,
+	# inside MDT part of data
+	sz=$((1024*1024-13))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (9)"
+
+	# truncate to a larger, non-multiple of PAGE_SIZE, non-multiple of 16,
+	# inside OST part of data
+	sz=$((1024*1024+7))
+	$TRUNCATE $tmpfile $sz
+	$TRUNCATE $testfile $sz
+	cancel_lru_locks osc ; cancel_lru_locks mdc
+	cmp -bl $tmpfile $testfile ||
+		error "file $testfile is corrupted (10)"
+
+	rm -f $tmpfile
+}
+run_test 50 "DoM encrypted file"
+
+log "cleanup: ======================================================"
+
+sec_unsetup() {
+	for num in $(seq $MDSCOUNT); do
+		if [ "${identity_old[$num]}" = 1 ]; then
+			switch_identity $num false || identity_old[$num]=$?
+		fi
+	done
+
+	$RUNAS_CMD -u $ID0 ls $DIR
+	$RUNAS_CMD -u $ID1 ls $DIR
+}
+sec_unsetup
 
 complete $SECONDS
+check_and_cleanup_lustre
 exit_status