From: Sebastien Buisson Date: Tue, 4 Apr 2023 14:53:22 +0000 (+0200) Subject: LU-16708 tests: fix zconf_mount_clients for SSK X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a9468fe41a151d8722d21f9a98878639419dc803;p=fs%2Flustre-release.git LU-16708 tests: fix zconf_mount_clients for SSK When SHARED_KEY is in use, zconf_mount_clients can add 'skpath' mount option to load nodemap-specific keys. But this must not overwrite already specified mount options. Lustre-change: https://review.whamcloud.com/50523 Lustre-commit: TBD (bd0d4644467192f5272bcc483663060314aec05a) Fixes: eee562b0a9 ("LU-16683 tests: fix sanity-sec test_61 for SSK") Test-Parameters: trivial Test-Parameters: testlist=sanity-sec env=ONLY=61 Test-Parameters: testlist=sanity-sec env=SHARED_KEY=true,ONLY=61 Signed-off-by: Sebastien Buisson Change-Id: I3dbc6ffe72722659ead77fb1c2c2675873c7aff2 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50524 Tested-by: jenkins Tested-by: Andreas Dilger Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 2425164..a9b49bd 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2511,7 +2511,7 @@ zconf_mount_clients() { fi do_node $nmclient "! grep -q $mnt' ' \ /proc/mounts || umount $mnt" - local prunedopts=$(add_sk_mntflag $prunedopts); + local prunedopts=$(add_sk_mntflag $opts); prunedopts=$(echo $prunedopts | sed -e \ "s#skpath=[^ ^,]*#skpath=$mountkey#g") set -x