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>
}
cleanup_for_enc_tests() {
+ local dummy_key
+
rm -rf $DIR/$tdir $*
# remount client normally
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() {