In test_70e, import state may not update while
mds stopping. Since statfs will be invoked in sles12
before umounting, so umount with force flag to avoid
waitting a long time.
Add -f to stopall call in test-framework for the same reason,
to do umount with force flag.
Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: I3d1e73b3501e98008ef18c05f7b5498d12cb46fb
Reviewed-on: https://review.whamcloud.com/28767
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
- umount_client $MOUNT || return 200
+ local force=""
+ [ "x$1" != "x" ] && force='-f'
+ umount_client $MOUNT $force|| return 200
cleanup_nocli || return $?
}
cleanup_nocli || return $?
}
echo "blah blah" > $MOUNT/$tfile
cat $MOUNT/$tfile || error "cat $MOUNT/$tfile failed"
echo "blah blah" > $MOUNT/$tfile
cat $MOUNT/$tfile || error "cat $MOUNT/$tfile failed"
- umount_client $MOUNT || error "umount_client $MOUNT failed"
+ umount_client $MOUNT -f || error "umount_client $MOUNT failed"
stop_ost || error "Unable to stop OST1"
stop_mds || error "Unable to stop MDS"
stop_mds || error "Unable to stop MDS on second try"
stop_ost || error "Unable to stop OST1"
stop_mds || error "Unable to stop MDS"
stop_mds || error "Unable to stop MDS on second try"
soc=$(do_facet mds1 "$LCTL get_param -n \
mdt.*MDT0000.sync_lock_cancel")
[ $soc == "never" ] || error "SoC enabled on single MDS"
soc=$(do_facet mds1 "$LCTL get_param -n \
mdt.*MDT0000.sync_lock_cancel")
[ $soc == "never" ] || error "SoC enabled on single MDS"
+ umount_client $MOUNT -f > /dev/null
cleanup || error "cleanup failed with $?"
}
cleanup || error "cleanup failed with $?"
}
reformat
setup
mkdir -p $TMP/$tdir
reformat
setup
mkdir -p $TMP/$tdir
# Set hostid for ZFS/SPL zpool import protection
# (Assumes MDS version is also OSS version)
if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.8.54) ];
# Set hostid for ZFS/SPL zpool import protection
# (Assumes MDS version is also OSS version)
if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.8.54) ];