From c9b9d5f6a95804fbbfbff60a23656d376cd3d2a4 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Mon, 21 Sep 2015 11:03:22 +1000 Subject: [PATCH] generic/038: speed up file creation Now that generic/038 is running on my test machine, I notice how slow it is: generic/038 692s 11-12 minutes for a single test is way too long. The test is creating 400,000 single block files, which can be easily parallelised and hence run much faster than the test is currently doing. Split the file creation up into 4 threads that create 100,000 files each. 4 is chosen because XFS defaults to 4AGs, ext4 still has decent speedups at 4 concurrent creates, and other filesystems aren't hurt by excessive concurrency. The result: generic/038 237s on the same machine, which is roughly 3x faster and so it (just) fast enough to to be considered acceptible. [Eryu Guan: reduced number of files to minimum needed to reproduce btrfs problem reliably, added $LOAD_FACTOR scaling for longer running.] Signed-off-by: Dave Chinner Reviewed-by: Eryu Guan Signed-off-by: Dave Chinner --- tests/generic/038 | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tests/generic/038 b/tests/generic/038 index 4d108cfc..4d3977a0 100755 --- a/tests/generic/038 +++ b/tests/generic/038 @@ -105,19 +105,31 @@ trim_loop() # the fallocate calls happen. So we don't really care if they all succeed or # not, the goal is just to keep metadata space usage growing while data block # groups are deleted. +# +# Creating 200,000 files sequentially is really slow, so speed it up a bit +# by doing it concurrently with 4 threads in 4 separate directories. +nr_files=$((50000 * LOAD_FACTOR)) create_files() { local prefix=$1 - for ((i = 1; i <= 400000; i++)); do - $XFS_IO_PROG -f -c "pwrite -S 0xaa 0 3900" \ - $SCRATCH_MNT/"${prefix}_$i" &> /dev/null - if [ $? -ne 0 ]; then - echo "Failed creating file ${prefix}_$i" >>$seqres.full - break - fi + for ((n = 0; n < 4; n++)); do + mkdir $SCRATCH_MNT/$n + ( + for ((i = 1; i <= $nr_files; i++)); do + $XFS_IO_PROG -f -c "pwrite -S 0xaa 0 3900" \ + $SCRATCH_MNT/$n/"${prefix}_$i" &> /dev/null + if [ $? -ne 0 ]; then + echo "Failed creating file $n/${prefix}_$i" >>$seqres.full + break + fi + done + ) & + create_pids[$n]=$! done + wait ${create_pids[@]} + } _scratch_mkfs >>$seqres.full 2>&1 -- 2.39.5