From 24ae2519acd15691d9e319ffc8675cee60529b95 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Thu, 7 Mar 2024 13:58:53 +0530 Subject: [PATCH] LU-17057 tests: Fix "...endpoint shutdown" under sanity-sec This patch fixes test_0 failing with "Cannot send after transport endpoint shutdown" by introducing wait_ssk() in sec_setup() to deterministicly applied SSK flavor. Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Test-Parameters: trivial mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity-sec env=SHARED_KEY=true,ONLY=0 Signed-off-by: Sebastien Buisson Signed-off-by: Arshad Hussain Change-Id: Ia14021ab82913507df02dbb5a12c8596663f15d9 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54311 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/sanity-sec.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 0459195..789c73e 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -125,6 +125,18 @@ sec_login() { declare -a identity_old +wait_ssk() { + # wait for SSK flavor to be applied if necessary + if $GSS_SK; then + if $SK_S2S; then + wait_flavor all2all $SK_FLAVOR + else + wait_flavor cli2mdt $SK_FLAVOR + wait_flavor cli2ost $SK_FLAVOR + fi + fi +} + sec_setup() { for ((num = 1; num <= $MDSCOUNT; num++)); do switch_identity $num true || identity_old[$num]=$? @@ -137,6 +149,7 @@ sec_setup() { if ! $RUNAS_CMD -u $ID1 ls $DIR > /dev/null 2>&1; then sec_login $USER1 $USER1 fi + wait_ssk } sec_setup @@ -3022,18 +3035,6 @@ remove_enc_key() { fi } -wait_ssk() { - # wait for SSK flavor to be applied if necessary - if $GSS_SK; then - if $SK_S2S; then - wait_flavor all2all $SK_FLAVOR - else - wait_flavor cli2mdt $SK_FLAVOR - wait_flavor cli2ost $SK_FLAVOR - fi - fi -} - remount_client_normally() { # remount client without dummy encryption key if is_mounted $MOUNT; then -- 1.8.3.1