From: Elena Gryaznova Date: Tue, 2 Nov 2010 13:55:52 +0000 (+0300) Subject: b=23402 mmp_fini () multiple oss fix X-Git-Tag: 2.0.55.0~2 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b64f29f16e6b7eed70cb61815634699acab5339a b=23402 mmp_fini () multiple oss fix i=Yu.Jian --- diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh index ea80120..1749673 100755 --- a/lustre/tests/mmp.sh +++ b/lustre/tests/mmp.sh @@ -185,7 +185,8 @@ mmp_init() { # which did not use failover. mmp_fini() { - if [ -z "$mdsfailover_HOST" ]; then + local var=${MMP_MDS}failover_HOST + if [ -z "${!var}" ]; then log "Failover is not used on MDS, disabling MMP manually..." disable_mmp $MMP_MDS $MMP_MDSDEV || \ error "failed to disable MMP on $MMP_MDSDEV on $MMP_MDS" @@ -193,7 +194,8 @@ mmp_fini() { error "MMP was not disabled on $MMP_MDSDEV on $MMP_MDS" fi - if [ -z "$ostfailover_HOST" ]; then + var=${MMP_OSS}failover_HOST + if [ -z "${!var}" ]; then log "Failover is not used on OSS, disabling MMP manually..." disable_mmp $MMP_OSS $MMP_OSTDEV || \ error "failed to disable MMP on $MMP_OSTDEV on $MMP_OSS"