diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2024-03-13 14:51:24 +1300 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2024-03-13 14:58:27 +1300 |
| commit | 0265e5c120e0971a9c50a1e27ce4cb847c15a1bf (patch) | |
| tree | bfd15562f889724b4fa35c9118161b9283c2c0fd /src | |
| parent | 77cf6a78de9fa48976d8c9152a48290beb06dc8b (diff) | |
ci: Use a RAM disk and more CPUs on FreeBSD.
Run the tests in a RAM disk. It's still a UFS file system and is backed
by 20GB of disk, but this avoids a lot of I/O. Even though we disable
fsync, our tests do a lot of directory manipulations, some of which
force file system meta-data to disk and flush slow device write caches
on UFS. This was a bottleneck preventing effective scaling beyond 2
CPUs.
Now we can use 4 CPUs like on other OSes, for a huge speedup.
Reviewed-by: Maxim Orlov <orlovmg@gmail.com>
Discussion: https://postgr.es/m/CA%2BhUKG%2BFXLcEg1dyTqJjDiNQ8pGom4KrJj4wF38C90thti9dVA%40mail.gmail.com
Diffstat (limited to 'src')
| -rwxr-xr-x | src/tools/ci/gcp_freebsd_repartition.sh | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/tools/ci/gcp_freebsd_repartition.sh b/src/tools/ci/gcp_freebsd_repartition.sh index 2d5e1738998..cc7f6bc35ef 100755 --- a/src/tools/ci/gcp_freebsd_repartition.sh +++ b/src/tools/ci/gcp_freebsd_repartition.sh @@ -3,26 +3,24 @@ set -e set -x -# The default filesystem on freebsd gcp images is very slow to run tests on, -# due to its 32KB block size -# -# XXX: It'd probably better to fix this in the image, using something like -# https://people.freebsd.org/~lidl/blog/re-root.html - # fix backup partition table after resize gpart recover da0 gpart show da0 -# kill swap, so we can delete a partition -swapoff -a || true -# (apparently we can only have 4!?) + +# delete and re-add swap partition with expanded size +swapoff -a gpart delete -i 3 da0 -gpart add -t freebsd-ufs -l data8k -a 4096 da0 +gpart add -t freebsd-swap -l swapfs -a 4096 da0 gpart show da0 -newfs -U -b 8192 /dev/da0p3 +swapon -a + +# create a file system on a memory disk backed by swap, to minimize I/O +mdconfig -a -t swap -s20g -u md1 +newfs -b 8192 -U /dev/md1 -# Migrate working directory +# migrate working directory du -hs $CIRRUS_WORKING_DIR mv $CIRRUS_WORKING_DIR $CIRRUS_WORKING_DIR.orig mkdir $CIRRUS_WORKING_DIR -mount -o noatime /dev/da0p3 $CIRRUS_WORKING_DIR +mount -o noatime /dev/md1 $CIRRUS_WORKING_DIR cp -r $CIRRUS_WORKING_DIR.orig/* $CIRRUS_WORKING_DIR/ |