LU-18964 tests: performance-sanity test_2 fixed large

test_2 in performance-sanity previously had mdsrate-create-large
meaning that the files themselves were large, however for performance
testing this doesn't make much sense as this is largely dependant on
the system IO. Instead large now means a large number of files (1M),
which was the original goal of these tests.

The SLOW/zfs check was also moved from test_1 to test_2 as it had
been left when the tests were renumbered.

Fixes: 01d16dadab ("LU-14697 tests: change performance-sanity to use mdtest")
Test-Parameters: trivial testlist=performance-sanity env=ONLY=1+2
Signed-off-by: Frederick Dilger <fdilger@whamcloud.com>
Change-Id: I602b76c050d29b5d401971123caa73e5d4844342
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/59047
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 549000a..c2a9e7b 100644 (file)
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -30,10 +30,6 @@ env_verify()
 test_1() {
        env_verify
        echo "Small files creation performance test"
-       # LU-2600/LU-4108 - Decrease load on zfs
-       if [[ "$SLOW" == no && "$mds1_FSTYPE" == zfs ]]; then
-               NUM_FILES=10000
-       fi
        run_mdtest create-small
 }
 run_test 1 "small files create/open/delete"
@@ -41,6 +37,10 @@ run_test 1 "small files create/open/delete"
 test_2() {
        env_verify
        echo "Large files creation performance test"
+       # LU-2600/LU-4108 - Decrease load on zfs
+       if [[ "$SLOW" == no && "$mds1_FSTYPE" == zfs ]]; then
+               NUM_FILES=10000
+       fi
        run_mdtest create-large
 }
 run_test 2 "large files create/open/delete"

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index edf7256..7362a66 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -8672,14 +8672,12 @@ run_mdtest () {
        create-small)
                stripe_options=(-c 1 -i 0)
                mdtest_actions=(-F -R)
-               file_size=1024
+               file_size=3901
                num_files=100000
                ;;
        create-large)
-               stripe_options=(-c -1)
                mdtest_actions=(-F -R)
-               file_size=$((1024 * 1024 * 1024))
-               num_files=16
+               num_files=1000000
                ;;
        lookup-single)
                stripe_options=(-c 1)