X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-sec.sh;h=a7c3074518361f08626e65f72927e5ba3e7e958e;hp=328cb9ee4247a6e145b29854399ff5c22fd28ac0;hb=b45169276ce1ab09dae7a733859f89a6c92808e5;hpb=0f9c30fc32b0558bd62a319cbe78b3883b500987

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 328cb9e..a7c3074 100755
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -1962,6 +1962,12 @@ nodemap_exercise_fileset() {
 	if [ "$nm" == "default" ]; then
 		do_facet mgs $LCTL nodemap_activate 1
 		wait_nm_sync active
+		do_facet mgs $LCTL nodemap_modify --name default \
+			--property admin --value 1
+		do_facet mgs $LCTL nodemap_modify --name default \
+			--property trusted --value 1
+		wait_nm_sync default admin_nodemap
+		wait_nm_sync default trusted_nodemap
 		check_proj=false
 	else
 		nodemap_test_setup
@@ -2014,10 +2020,10 @@ nodemap_exercise_fileset() {
 		error "fileset not taken into account"
 
 	if $check_proj; then
-		$LFS setquota -p 1  -b 10000 -B 11000 -i 0 -I 0 $MOUNT ||
-			error "setquota -p 1 failed"
-		$LFS setquota -p 2  -b 10000 -B 11000 -i 0 -I 0 $MOUNT &&
-			error "setquota -p 2 should have failed"
+		do_node ${clients_arr[0]} $LFS setquota -p 1 -b 10000 -B 11000 \
+			-i 0 -I 0 $MOUNT || error "setquota -p 1 failed"
+		do_node ${clients_arr[0]} $LFS setquota -p 2 -b 10000 -B 11000 \
+			-i 0 -I 0 $MOUNT && error "setquota -p 2 should fail"
 	fi
 
 	# re-mount client with sub-subdir
@@ -2062,6 +2068,12 @@ nodemap_exercise_fileset() {
 	fi
 	fileset_test_cleanup "$nm"
 	if [ "$nm" == "default" ]; then
+		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 admin_nodemap
+		wait_nm_sync default trusted_nodemap
 		do_facet mgs $LCTL nodemap_activate 0
 		wait_nm_sync active 0
 		trap 0