From a207f126b914c4c7cb7fbd8719583888491a4750 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Thu, 24 Dec 2015 18:07:06 +0100 Subject: [PATCH] LU-7609 tests: fix sanity-krb5 Fix various issues with sanity-krb5 test script: - replace elan with $NETTYPE in test 99; - start gss daemon on MGS in test 151. Signed-off-by: Sebastien Buisson Change-Id: I5056240f733e82a59d96543b08476a959449f29d Reviewed-on: http://review.whamcloud.com/17727 Tested-by: Jenkins Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity-krb5.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-krb5.sh b/lustre/tests/sanity-krb5.sh index f116cbf..d38ad00 100755 --- a/lustre/tests/sanity-krb5.sh +++ b/lustre/tests/sanity-krb5.sh @@ -466,10 +466,10 @@ test_99() { echo "original general rules: $nrule_old" for ((i = $nrule_old; i < $max; i++)); do - set_rule $FSNAME elan$i any krb5n || error "set rule $i" + set_rule $FSNAME ${NETTYPE}$i any krb5n || error "set rule $i" done for ((i = $nrule_old; i < $max; i++)); do - set_rule $FSNAME elan$i any || error "remove rule $i" + set_rule $FSNAME ${NETTYPE}$i any || error "remove rule $i" done nrule_new=$(do_facet mgs lctl get_param -n mgs.MGS.live.$FSNAME \ @@ -486,10 +486,10 @@ test_99() { echo "original target rules: $nrule_old" for ((i = $nrule_old; i < $max; i++)); do - set_rule $FSNAME-MDT0000 elan$i any krb5i || error "set rule $i" + set_rule $FSNAME-MDT0000 ${NETTYPE}$i any krb5i || error "set rule $i" done for ((i = $nrule_old; i < $max; i++)); do - set_rule $FSNAME-MDT0000 elan$i any || error "remove rule $i" + set_rule $FSNAME-MDT0000 ${NETTYPE}$i any || error "remove rule $i" done nrule_new=$(do_facet mgs lctl get_param -n mgs.MGS.live.$FSNAME \ @@ -761,6 +761,9 @@ test_151() { # umount everything, modules still loaded stopall + # start gss daemon on mgs node + combined_mgs_mds || start_gss_daemons $mgs_HOST "$LSVCGSSD -v" + # start mgs start mgs $(mgsdevname 1) $MDS_MOUNT_OPTS -- 1.8.3.1