LU-15407 test: remove dummy enc key at cleanup

Make sure to remove the dummy encryption key from session keyring
when cleaning up encryption tests.

Test-Parameters: trivial
Test-Parameters: testlist=sanity-sec mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I840490fca0a485110d077fe85254ced817fd55e3
Reviewed-on: https://review.whamcloud.com/46038
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 579a30b..d6edcc6 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -2725,6 +2725,8 @@ setup_for_enc_tests() {
 }
 
 cleanup_for_enc_tests() {
+       local dummy_key
+
        rm -rf $DIR/$tdir $*
 
        # remount client normally
@@ -2741,6 +2743,13 @@ cleanup_for_enc_tests() {
                mount_client $MOUNT2 ${MOUNT_OPTS} ||
                        error "remount failed"
        fi
+
+       # remove fscrypt key from keyring
+       dummy_key=$(keyctl show | awk '$7 ~ "^fscrypt:" {print $1}')
+       if [ -n "$dummy_key" ]; then
+               keyctl revoke $dummy_key
+               keyctl reap
+       fi
 }
 
 cleanup_nodemap_after_enc_tests() {