From ea6160baac7da8491b9174f05d3d77dbae488d88 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 30 Jan 2023 14:56:41 -0700 Subject: [PATCH] LU-12275 tests: skip new nodemap params on old MGS Skip setting forbid_encryption and readonly_mount parameters on old MGSes that do not support these options. Otherwise test_61 failures are seen during interop testing. Running test_36 would also fail in this case, except that it is already skipped due to encryption checks. Lustre-change: https://review.whamcloud.com/49828 Lustre-commit: TBD (from 74c9b1f6e4d5b1fbbd615b87fb7c62c0fcb1a727) Test-Parameters: trivial testlist=sanity-sec Fixes: 598c48707c ("LU-12275 tests: exercise file content encryption/decryption") Fixes: e7ce67de92 ("LU-15451 sec: read-only nodemap flag") Signed-off-by: Andreas Dilger Change-Id: I94f2e2f609927fea618a3a22f103bd32ae3ebbe5 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49829 Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity-sec.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index e03e770e..69e415d 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -497,7 +497,7 @@ squash_id default 99 0 wait_nm_sync default squash_uid '' inactive squash_id default 99 1 wait_nm_sync default squash_gid '' inactive -if [ "$MDS1_VERSION" -ge $(version_code 2.14.0) ]; then +if [ "$MDS1_VERSION" -ge $(version_code 2.14.0.24) ]; then squash_id default 99 2 wait_nm_sync default squash_projid '' inactive fi @@ -2674,7 +2674,7 @@ test_34() { run_test 34 "deny_unknown on default nodemap" test_35() { - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.13.50) ] || + (( $MDS1_VERSION >= $(version_code 2.13.50) )) || skip "Need MDS >= 2.13.50" # activate changelogs @@ -2793,20 +2793,26 @@ cleanup_for_enc_tests() { cleanup_nodemap_after_enc_tests() { umount_client $MOUNT || true - do_facet mgs $LCTL nodemap_modify --name default \ - --property forbid_encryption --value 0 - do_facet mgs $LCTL nodemap_modify --name default \ - --property readonly_mount --value 0 || true + if (( MGS_VERSION >= $(version_code 2.13.55) )); then + do_facet mgs $LCTL nodemap_modify --name default \ + --property forbid_encryption --value 0 + if (( MGS_VERSION >= $(version_code 2.14.0.51) )); then + do_facet mgs $LCTL nodemap_modify --name default \ + --property readonly_mount --value 0 || true + fi + fi do_facet mgs $LCTL nodemap_modify --name default \ --property trusted --value 0 do_facet mgs $LCTL nodemap_modify --name default \ --property admin --value 0 do_facet mgs $LCTL nodemap_activate 0 - wait_nm_sync default forbid_encryption '' inactive - [ -z "$(do_facet mgs \ - lctl get_param -n nodemap.default.readonly_mount)" ] || - wait_nm_sync default readonly_mount '' inactive + if (( MGS_VERSION >= $(version_code 2.13.55) )); then + wait_nm_sync default forbid_encryption '' inactive + if (( MGS_VERSION >= $(version_code 2.14.0.51) )); then + wait_nm_sync default readonly_mount '' inactive + fi + fi wait_nm_sync default trusted_nodemap '' inactive wait_nm_sync default admin_nodemap '' inactive wait_nm_sync active -- 1.8.3.1