LU-15098 tests: sanity-sec 27a exec commands on right node

[fs/lustre-release.git] / lustre / tests / sanity-sec.sh

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 328cb9e..a7c3074 100755 (executable)
--- 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