From a23bb09a3bc447e4286218416d1dd5d096724bfc Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 23 May 2017 11:37:13 -0700 Subject: [PATCH] LU-9487 tests: stop primary and failover services in mmp test 1 In mmp.sh test_1(), there is a race of starting the primary and failover services at the same time. Since it's likely the failover service is started before the primary one, we need check and stop the failover service. Test-Parameters: trivial \ envdefinitions=MMP_EXCEPT=5 \ clientcount=4 osscount=2 mdscount=2 mdtcount=1 \ austeroptions=-R failover=true iscsi=1 \ testlist=mmp Change-Id: I945f4eb7839400e75b372fc0cc9ad9455ccb5668 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/27253 Tested-by: Jenkins Reviewed-by: Alex Zhuravlev Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/mmp.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh index db5ce5a..4b0b02f 100755 --- a/lustre/tests/mmp.sh +++ b/lustre/tests/mmp.sh @@ -429,10 +429,11 @@ mmp_init # Test 1 - two mounts at the same time. test_1() { - check_failover_pair || return 0 + check_failover_pair || return 0 - mount_after_interval 0 0 || return ${PIPESTATUS[0]} - stop_services primary || return ${PIPESTATUS[0]} + mount_after_interval 0 0 || return ${PIPESTATUS[0]} + stop_services primary || return ${PIPESTATUS[0]} + stop_services failover || return ${PIPESTATUS[0]} } run_test 1 "two mounts at the same time" -- 1.8.3.1