From 695c03c23a1a6bb8667d377895116efa0ac91990 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Tue, 11 Sep 2018 20:54:43 +0300 Subject: [PATCH] LU-11365 tests: test-framework::add() to load ldiskfs when the tests run from in-tree build, then mkfs.lustre can not rely on modprobe and ldiskfs needs to be loaded explicitly. otherwise some tests like conf-sanity/55 fail. Change-Id: Ic15f0eab8e483d5de9f63606433fbb26f754fd55 Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/33140 Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 033e32a..bee4e79 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -4230,6 +4230,12 @@ add() { stop ${facet} -f rm -f $TMP/${facet}active [[ $facet = mds1 ]] && combined_mgs_mds && rm -f $TMP/mgsactive + + # make sure in-tree ldiskfs is loaded before mkfs + if local_mode && [[ $(node_fstypes $HOSTNAME) == *ldiskfs* ]]; then + load_module ../ldiskfs/ldiskfs + fi + do_facet ${facet} $MKFS $* || return ${PIPESTATUS[0]} if [[ $(facet_fstype $facet) == zfs ]]; then -- 1.8.3.1