From: Sebastien Buisson <sbuisson@ddn.com>
Date: Thu, 27 Jun 2019 10:08:17 +0000 (+0200)
Subject: LU-12131 tests: fix test_802a for GSS
X-Git-Tag: 2.12.57~146
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a51d0653cf46fc898da01f86c26cc0f4f5beff5a;p=fs%2Flustre-release.git

LU-12131 tests: fix test_802a for GSS

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

Test-Parameters: trivial
Test-Parameters: envdefinitions=ONLY=802a testlist=sanity
Test-Parameters: envdefinitions=SHARED_KEY=true,ONLY=802a testlist=sanity
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I8189c245870fb0caf48006db11621f0af48e1878
Reviewed-on: https://review.whamcloud.com/35335
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>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2da2d77..4dcc658 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -20562,6 +20562,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_802a() {
 	trap 0
@@ -20570,6 +20571,7 @@ cleanup_802a() {
 	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
 }
 
@@ -20605,7 +20607,8 @@ test_802a() {
 		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"