LU-12390 tests: customise mdsrate tests

Patch adds the following customizations:
  set custom layout for filesystem root
  directory by specifying fs_STRIPEPARAMS
  and
  set the custom layout for mdsrate test's
  working directory BASEDIR by specifying
  mdsrate_STRIPEPARAMS.

Test-Parameters: trivial testlist=performance-sanity
Signed-off-by: Elena Gryaznova <c17455@cray.com>
Cray-bug-id: LUS-7249
Reviewed-by: Alexander Boyko <c17825@cray.com>
Reviewed-by: Vladimir Saveliev <c17830@cray.com>
Change-Id: I28524c203f86e7e94a4db47a8d8c4b3518883600
Reviewed-on: https://review.whamcloud.com/35068
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index 2fbdd8d..8d75f0a 100644 (file)
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -34,8 +34,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -c -1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c -1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index d3d18b5..16fdf05 100644 (file)
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -42,8 +42,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -i 0 -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-i 0 -c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then

diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index 4e89f22..e8c24c1 100644 (file)
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -40,8 +40,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(($(mdsrate_inodes_available) - NUM_DIRS))
 if [ $IFree -lt $((NUM_FILES * NUM_DIRS)) ]; then

diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index f116252..bb85a78 100644 (file)
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -39,8 +39,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then

diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh
index aaa3701..277358d 100644 (file)
--- a/lustre/tests/mdsrate-stat-large.sh
+++ b/lustre/tests/mdsrate-stat-large.sh
@@ -41,8 +41,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -c -1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c -1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then

diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh
index e10b5a8..e95c26e 100644 (file)
--- a/lustre/tests/mdsrate-stat-small.sh
+++ b/lustre/tests/mdsrate-stat-small.sh
@@ -41,8 +41,8 @@ check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -i 0 -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-i 0 -c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 3e7822a..186c66b 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -5398,6 +5398,9 @@ check_and_setup_lustre() {
                fi
        fi
 
+       if [ -n "$fs_STRIPEPARAMS" ]; then
+               setstripe_getstripe $MOUNT $fs_STRIPEPARAMS
+       fi
        if $GSS_SK; then
                set_flavor_all null
        elif $GSS; then