LU-12131 tests: fix test_802 for GSS

test_802 should not overwrite already existing client mount options
when trying to mount client as read-only.

Lustre-change: https://review.whamcloud.com/35335
Lustre-commit: a51d0653cf46fc898da01f86c26cc0f4f5beff5a

Test-Parameters: trivial
Test-Parameters: envdefinitions=ONLY=802 testlist=sanity
Test-Parameters: envdefinitions=SHARED_KEY=true,ONLY=802 testlist=sanity
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I8189c245870fb0caf48006db11621f0af48e1878
Reviewed-on: https://review.whamcloud.com/35535
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 7045dbf..f7f6339 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -19938,6 +19938,7 @@ run_test 801c "rescan barrier bitmap"
 saved_MGS_MOUNT_OPTS=$MGS_MOUNT_OPTS
 saved_MDS_MOUNT_OPTS=$MDS_MOUNT_OPTS
 saved_OST_MOUNT_OPTS=$OST_MOUNT_OPTS
+saved_MOUNT_OPTS=$MOUNT_OPTS
 
 cleanup_802() {
        trap 0
@@ -19946,6 +19947,7 @@ cleanup_802() {
        MGS_MOUNT_OPTS=$saved_MGS_MOUNT_OPTS
        MDS_MOUNT_OPTS=$saved_MDS_MOUNT_OPTS
        OST_MOUNT_OPTS=$saved_OST_MOUNT_OPTS
+       MOUNT_OPTS=$saved_MOUNT_OPTS
        setupall
 }
 
@@ -19981,7 +19983,8 @@ test_802() {
                error "(4) Mount client without 'ro' should fail"
 
        echo "Mount client with ro should succeed"
-       mount_client $MOUNT ro ||
+       MOUNT_OPTS=$(csa_add "$MOUNT_OPTS" -o ro)
+       mount_client $MOUNT ||
                error "(5) Mount client with 'ro' should succeed"
 
        echo "Modify should be refused"