From 3c64d3310b7b46689b69091f512663bcb5aecdaf Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Thu, 13 Dec 2018 18:02:47 +0900 Subject: [PATCH 1/1] LU-11749 tests: sanity-sec 23b exec commands on right node In sanity-sec test 23b, make sure commands are executed on client 1, then client 2. Otherwise, ACL mapping cannot be correctly demonstrated. Test-Parameters: trivial clientcount=2 envdefinitions=ONLY=23b testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec,sanity-sec,sanity-sec Signed-off-by: Sebastien Buisson Change-Id: Iffa3946be149313af696907fa6c83a6ea58cb3f6 Reviewed-on: https://review.whamcloud.com/33846 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- lustre/tests/sanity-sec.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 8410b84..3e04aab 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -1814,18 +1814,18 @@ test_23b() { #LU-9929 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 client2 (mapped gid=60010) + # 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_node ${clients_arr[1]} getent passwd | -- 1.8.3.1