From 3973c51b0ba246fb9904235206e6b9269d670a51 Mon Sep 17 00:00:00 2001 From: Hema Yarramilli Date: Wed, 25 May 2016 19:33:15 +0530 Subject: [PATCH] LU-7442 tests: Load modules on MDS/OSS in conf-sanity test_41c Lustre modules were not present after "cleanup" in test_41c. So test was failing while setting the "fail_loc" param on the MDS/OSS. This patch adds "load_modules" after "cleanup". Test-Parameters: trivial testlist=conf-sanity Seagate-bug-id: MRP-2711 Signed-off-by: Ashish Maurya Signed-off-by: Hema Yarramilli Change-Id: Icad9410765121bd17f00761477066f9cebf8f686 Reviewed-on: http://review.whamcloud.com/17301 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 5785b98..1bd8cff 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -2869,6 +2869,7 @@ run_test 41b "mount mds with --nosvc and --nomgs on first mount" test_41c() { local server_version=$(lustre_version_code $SINGLEMDS) + local oss_list=$(comma_list $(osts_nodes)) [[ $server_version -ge $(version_code 2.6.52) ]] || [[ $server_version -ge $(version_code 2.5.26) && @@ -2879,6 +2880,11 @@ test_41c() { cleanup # MDT concurrent start + + LOAD_MODULES_REMOTE=true load_modules + do_facet $SINGLEMDS "lsmod | grep -q libcfs" || + error "MDT concurrent start: libcfs module not loaded" + #define OBD_FAIL_TGT_MOUNT_RACE 0x716 do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x716" start mds1 $(mdsdevname 1) $MDS_MOUNT_OPTS & @@ -2909,6 +2915,9 @@ test_41c() { # OST concurrent start + do_rpc_nodes $oss_list "lsmod | grep -q libcfs" || + error "OST concurrent start: libcfs module not loaded" + #define OBD_FAIL_TGT_MOUNT_RACE 0x716 do_facet ost1 "$LCTL set_param fail_loc=0x716" start ost1 $(ostdevname 1) $OST_MOUNT_OPTS & -- 1.8.3.1