From: Xing Huang Date: Sun, 10 Sep 2023 08:07:16 +0000 (+0800) Subject: LU-13031 tests: avoid new user xattr in interop X-Git-Tag: 2.15.4-RC1~12 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fac50dcc27f09384981d995e1234943f06a17969;p=fs%2Flustre-release.git LU-13031 tests: avoid new user xattr in interop The xattr test of test_103a is expecting that there are no other user xattrs, but the patch(#50982) is adding a new user xattr to every file. This new xattr can be disabled when running with new clients and old servers, but this is not easily possible with old clients (where the test scripts run) and new servers (that have that patch #50982). We can have this change to avoid the above problem. Test-Parameters: testlist=sanity serverjob=lustre-b_es-reviews serverbuildno=12671 env=ONLY=103 Signed-off-by: Xing Huang Change-Id: Iaf4bd81be7e43d946ec184e7d8d65326983c351d Reviewed-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52332 Tested-by: Maloo Tested-by: jenkins --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 7b4d43e..55a31ee 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -11441,6 +11441,13 @@ test_103a() { skip_env "could not find setfacl" remote_mds_nodsh && skip "remote MDS with nodsh" + local mdts=$(comma_list $(mdts_nodes)) + local saved=$(do_facet mds1 $LCTL get_param -n mdt.$FSNAME-MDT0000.job_xattr) + + [[ -z "$saved" ]] || do_nodes $mdts $LCTL set_param mdt.*.job_xattr=NONE + stack_trap "[[ -z \"$saved\" ]] || \ + do_nodes $mdts $LCTL set_param mdt.*.job_xattr=$saved" EXIT + gpasswd -a daemon bin # LU-5641 do_facet $SINGLEMDS gpasswd -a daemon bin # LU-5641