From: Sebastien Buisson <sbuisson@ddn.com>
Date: Tue, 11 Jan 2022 07:27:42 +0000 (+0100)
Subject: LU-15407 test: remove dummy enc key at cleanup
X-Git-Tag: 2.14.57~25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ec0b308614a2bad18a7a1fd805f36eb8ed6ea5eb;p=fs%2Flustre-release.git

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
--- 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() {