X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=fa3dadbe5c6031c6f6cd51de2ded0b94161083e6;hp=33f77652392d5344c0a1658a92cf86d33c6d1c43;hb=a9257f57ad27a1b1219cfd8ce29fbfabdca1df84;hpb=19ca690b5150a316d505f8f72671906682fbfb28 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 33f7765..fa3dadb 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -463,7 +463,6 @@ load_modules_local() { fi fi - local ncpts=0 # if there is only one CPU core, libcfs can only create one partition # if there is more than 4 CPU cores, libcfs should create multiple CPU # partitions. So we just force libcfs to create 2 partitions for @@ -471,12 +470,12 @@ load_modules_local() { if [ $ncpus -le 4 ] && [ $ncpus -gt 1 ]; then # force to enable multiple CPU partitions echo "Force libcfs to create 2 CPU partitions" - ncpts=2 + MODOPTS_LIBCFS="cpu_npartitions=2 $MODOPTS_LIBCFS" else echo "libcfs will create CPU partition based on online CPUs" fi - load_module ../libcfs/libcfs/libcfs cpu_npartitions=$ncpts + load_module ../libcfs/libcfs/libcfs [ "$PTLDEBUG" ] && lctl set_param debug="$PTLDEBUG" [ "$SUBSYSTEM" ] && lctl set_param subsystem_debug="${SUBSYSTEM# }"