From 1d6bc46beab54b6f12c9c0814bd813bee99877d9 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 15 Nov 2013 22:02:05 +0800 Subject: [PATCH] LU-3906 tests: fix space estimation codes in run_compilebench() While running compilebench test, the actual space required for each kernel directory is about 1GB instead of 680MB. This patch fixes this number in run_compilebench() so as to make the space estimation more correct. Test-Parameters: envdefinitions=SLOW=yes,ONLY=compilebench \ testlist=parallel-scale,parallel-scale-nfsv3,parallel-scale-nfsv4 Test-Parameters: envdefinitions=SLOW=yes,ONLY=compilebench \ mdtfilesystemtype=zfs mdsfilesystemtype=zfs ostfilesystemtype=zfs \ ostcount=2 \ testlist=parallel-scale,parallel-scale-nfsv3,parallel-scale-nfsv4 Signed-off-by: Jian Yu Change-Id: Ic19e2bff352d3f7444f1da30cedfc832b825873f Reviewed-on: http://review.whamcloud.com/8288 Tested-by: Jenkins Reviewed-by: Nathaniel Clark Reviewed-by: Wei Liu Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/functions.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index c039746..db15bf5 100644 --- a/lustre/tests/functions.sh +++ b/lustre/tests/functions.sh @@ -267,10 +267,9 @@ print_opts () { } run_compilebench() { - -# Space estimation: -# compile dir kernel-1 680MB -# required space 680MB * cbench_IDIRS = ~1.4 Gb + # Space estimation: + # compile dir kernel-0 ~1GB + # required space ~1GB * cbench_IDIRS cbench_DIR=${cbench_DIR:-""} cbench_IDIRS=${cbench_IDIRS:-2} @@ -284,14 +283,16 @@ run_compilebench() { [ -e $cbench_DIR/compilebench ] || \ { skip_env "No compilebench build" && return; } - local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }') - if [ $space -le $((680 * 1024 * cbench_IDIRS)) ]; then - cbench_IDIRS=$(( space / 680 / 1024)) - [ $cbench_IDIRS = 0 ] && \ - skip_env "Need free space atleast 680 Mb, have $space" && return + local space=$(lfs_df $DIR | awk '/^filesystem/{ print $4 }') + if [[ $space -le $((1024 * 1024 * cbench_IDIRS)) ]]; then + cbench_IDIRS=$((space / 1024 / 1024)) + [[ $cbench_IDIRS -eq 0 ]] && + skip_env "Need free space at least 1GB, have $space" && + return + + echo "free space=$space, reducing initial dirs to $cbench_IDIRS" + fi - log free space=$space, reducing initial dirs to $cbench_IDIRS - fi # FIXME: # t-f _base needs to be modifyed to set properly tdir # for new "test_foo" functions names -- 1.8.3.1