From 8720185780f0a20afefc43499b651052dc4d14eb Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 20 Jul 2024 11:22:15 +0300 Subject: [PATCH] Run tests in CI in memory (in tmpfs) --- .gitea/workflows/test.yml | 1 + tests/common.sh | 19 ++++++++++++++----- tests/run_3osds.sh | 4 ++-- tests/test_checksum.sh | 12 ++++++------ tests/test_heal.sh | 8 ++++---- tests/test_move_reappear.sh | 4 ++-- tests/test_rebalance_verify.sh | 16 ++++++++-------- tests/test_resize.sh | 20 ++++++++++---------- tests/test_scrub.sh | 12 ++++++------ tests/test_snapshot.sh | 22 +++++++++++----------- tests/test_snapshot_chain.sh | 20 ++++++++++---------- tests/test_snapshot_down.sh | 12 ++++++------ tests/test_splitbrain.sh | 2 +- tests/test_vm_cont.sh | 2 +- tests/test_write.sh | 4 ++-- 15 files changed, 84 insertions(+), 74 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 0a095273..e8738a50 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -16,6 +16,7 @@ env: BUILDENV_IMAGE: git.yourcmc.ru/vitalif/vitastor/buildenv TEST_IMAGE: git.yourcmc.ru/vitalif/vitastor/test OSD_ARGS: '--etcd_quick_timeout 2000' + USE_RAMDISK: 1 concurrency: group: ci-${{ github.ref }} diff --git a/tests/common.sh b/tests/common.sh index 7775142d..8295ebe0 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -25,11 +25,22 @@ ETCD_IP=${ETCD_IP:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-12379} ETCD_COUNT=${ETCD_COUNT:-1} ANTIETCD=${ANTIETCD} +USE_RAMDISK=${USE_RAMDISK} -if [ "$KEEP_DATA" = "" ]; then +RAMDISK=/run/user/$(id -u) +findmnt $RAMDISK >/dev/null || (sudo mkdir -p $RAMDISK && sudo mount -t tmpfs tmpfs $RAMDISK) + +if [[ -z "$KEEP_DATA" ]]; then rm -rf ./testdata - rm -rf /run/user/$(id -u)/testdata_etcd* + rm -rf /run/user/$(id -u)/testdata_etcd* /run/user/$(id -u)/testdata_bin mkdir -p ./testdata + if [[ -n "$USE_RAMDISK" ]]; then + OSD_ARGS="$OSD_ARGS --data_io cached" + mkdir -p /run/user/$(id -u)/testdata_bin + ln -s /run/user/$(id -u)/testdata_bin ./testdata/bin + else + mkdir -p ./testdata/bin + fi fi ETCD_URL="http://$ETCD_IP:$ETCD_PORT" @@ -41,9 +52,7 @@ start_etcd() { local i=$1 if [[ -z "$ANTIETCD" ]]; then - local t=/run/user/$(id -u) - findmnt $t >/dev/null || (sudo mkdir -p $t && sudo mount -t tmpfs tmpfs $t) - ionice -c2 -n0 $ETCD -name etcd$i --data-dir /run/user/$(id -u)/testdata_etcd$i \ + ionice -c2 -n0 $ETCD -name etcd$i --data-dir $RAMDISK/testdata_etcd$i \ --advertise-client-urls http://$ETCD_IP:$((ETCD_PORT+2*i-2)) --listen-client-urls http://$ETCD_IP:$((ETCD_PORT+2*i-2)) \ --initial-advertise-peer-urls http://$ETCD_IP:$((ETCD_PORT+2*i-1)) --listen-peer-urls http://$ETCD_IP:$((ETCD_PORT+2*i-1)) \ --initial-cluster-token vitastor-tests-etcd --initial-cluster-state new \ diff --git a/tests/run_3osds.sh b/tests/run_3osds.sh index 166b9b70..901fa266 100644 --- a/tests/run_3osds.sh +++ b/tests/run_3osds.sh @@ -50,8 +50,8 @@ if ! type -t osd_dev; then osd_dev() { local i=$1 - [[ -f ./testdata/test_osd$i.bin ]] || dd if=/dev/zero of=./testdata/test_osd$i.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) - echo ./testdata/test_osd$i.bin + [[ -f ./testdata/bin/test_osd$i.bin ]] || dd if=/dev/zero of=./testdata/bin/test_osd$i.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) + echo ./testdata/bin/test_osd$i.bin } fi diff --git a/tests/test_checksum.sh b/tests/test_checksum.sh index 362d3039..8a3d8418 100755 --- a/tests/test_checksum.sh +++ b/tests/test_checksum.sh @@ -13,13 +13,13 @@ $ETCDCTL put /vitastor/config/inode/1/1 '{"name":"testimg","size":'$((IMG_SIZE*1 # Write LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=1M -direct=1 -iodepth=4 \ - -mirror_file=./testdata/mirror.bin -end_fsync=1 -rw=write -etcd=$ETCD_URL -image=testimg -runtime=10 + -mirror_file=./testdata/bin/mirror.bin -end_fsync=1 -rw=write -etcd=$ETCD_URL -image=testimg -runtime=10 # Intentionally corrupt OSD data and restart it kill $OSD1_PID -data_offset=$(build/src/disk_tool/vitastor-disk simple-offsets ./testdata/test_osd1.bin $OFFSET_ARGS | grep data_offset | awk '{print $2}') -truncate -s $data_offset ./testdata/test_osd1.bin -dd if=/dev/zero of=./testdata/test_osd1.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) +data_offset=$(build/src/disk_tool/vitastor-disk simple-offsets ./testdata/bin/test_osd1.bin $OFFSET_ARGS | grep data_offset | awk '{print $2}') +truncate -s $data_offset ./testdata/bin/test_osd1.bin +dd if=/dev/zero of=./testdata/bin/test_osd1.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) start_osd 1 # FIXME: corrupt the journal WHEN OSD IS RUNNING and check reads too @@ -30,8 +30,8 @@ wait_up 10 # Read everything back qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \ - -O raw ./testdata/read.bin + -O raw ./testdata/bin/read.bin -diff ./testdata/read.bin ./testdata/mirror.bin +diff ./testdata/bin/read.bin ./testdata/bin/mirror.bin format_green OK diff --git a/tests/test_heal.sh b/tests/test_heal.sh index 851439d7..3959f4e2 100755 --- a/tests/test_heal.sh +++ b/tests/test_heal.sh @@ -20,7 +20,7 @@ $ETCDCTL put /vitastor/config/inode/1/1 '{"name":"testimg","size":'$((IMG_SIZE*1 LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4M -direct=1 -iodepth=1 -fsync=1 -rw=write \ - -mirror_file=./testdata/mirror.bin -etcd=$ETCD_URL -image=testimg -cluster_log_level=10 + -mirror_file=./testdata/bin/mirror.bin -etcd=$ETCD_URL -image=testimg -cluster_log_level=10 kill_osds() { @@ -53,13 +53,13 @@ kill_osds & LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bsrange=4k-128k -blockalign=4k -direct=1 -iodepth=32 -fsync=256 -rw=randrw \ - -randrepeat=0 -refill_buffers=1 -mirror_file=./testdata/mirror.bin -etcd=$ETCD_URL -image=testimg -loops=10 -runtime=120 + -randrepeat=0 -refill_buffers=1 -mirror_file=./testdata/bin/mirror.bin -etcd=$ETCD_URL -image=testimg -loops=10 -runtime=120 qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \ - -O raw ./testdata/read.bin + -O raw ./testdata/bin/read.bin -if ! diff -q ./testdata/read.bin ./testdata/mirror.bin; then +if ! diff -q ./testdata/bin/read.bin ./testdata/bin/mirror.bin; then format_error Data lost during self-heal fi diff --git a/tests/test_move_reappear.sh b/tests/test_move_reappear.sh index 174bffe4..174569ed 100755 --- a/tests/test_move_reappear.sh +++ b/tests/test_move_reappear.sh @@ -8,8 +8,8 @@ OSD_SIZE=1024 OSD_COUNT=5 OSD_ARGS="$OSD_ARGS" for i in $(seq 1 $OSD_COUNT); do - dd if=/dev/zero of=./testdata/test_osd$i.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) - build/src/osd/vitastor-osd --log_level 10 --osd_num $i --bind_address 127.0.0.1 --etcd_stats_interval 5 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & + dd if=/dev/zero of=./testdata/bin/test_osd$i.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) + build/src/osd/vitastor-osd --log_level 10 --osd_num $i --bind_address 127.0.0.1 --etcd_stats_interval 5 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/bin/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! done diff --git a/tests/test_rebalance_verify.sh b/tests/test_rebalance_verify.sh index 3e3fda81..21e4d32c 100755 --- a/tests/test_rebalance_verify.sh +++ b/tests/test_rebalance_verify.sh @@ -16,14 +16,14 @@ trap "sudo build/src/client/vitastor-nbd unmap $NBD_DEV"'; kill -9 $(jobs -p)' E sudo chown $(id -u) $NBD_DEV -dd if=/dev/urandom of=./testdata/img1.bin bs=1M count=$IMG_SIZE +dd if=/dev/urandom of=./testdata/bin/img1.bin bs=1M count=$IMG_SIZE -dd if=./testdata/img1.bin of=$NBD_DEV bs=1M count=$IMG_SIZE oflag=direct +dd if=./testdata/bin/img1.bin of=$NBD_DEV bs=1M count=$IMG_SIZE oflag=direct verify() { echo "Verifying before rebalance" - dd if=$NBD_DEV of=./testdata/img2.bin bs=1M count=$IMG_SIZE iflag=direct - diff ./testdata/img1.bin ./testdata/img2.bin + dd if=$NBD_DEV of=./testdata/bin/img2.bin bs=1M count=$IMG_SIZE iflag=direct + diff ./testdata/bin/img1.bin ./testdata/bin/img2.bin $ETCDCTL put /vitastor/config/osd/1 '{"reweight":'$1'}' $ETCDCTL put /vitastor/config/osd/2 '{"reweight":'$1'}' @@ -31,18 +31,18 @@ verify() { for i in {1..10000}; do O=$(((RANDOM*RANDOM) % (IMG_SIZE*128))) - dd if=$NBD_DEV of=./testdata/img2.bin bs=4k seek=$O skip=$O count=1 iflag=direct conv=notrunc + dd if=$NBD_DEV of=./testdata/bin/img2.bin bs=4k seek=$O skip=$O count=1 iflag=direct conv=notrunc done echo "Verifying during rebalance" - diff ./testdata/img1.bin ./testdata/img2.bin + diff ./testdata/bin/img1.bin ./testdata/bin/img2.bin # Wait for the rebalance to finish wait_finish_rebalance 300 echo "Verifying after rebalance" - dd if=$NBD_DEV of=./testdata/img2.bin bs=1M count=$IMG_SIZE iflag=direct - diff ./testdata/img1.bin ./testdata/img2.bin + dd if=$NBD_DEV of=./testdata/bin/img2.bin bs=1M count=$IMG_SIZE iflag=direct + diff ./testdata/bin/img1.bin ./testdata/bin/img2.bin } # Verify with regular reads diff --git a/tests/test_resize.sh b/tests/test_resize.sh index bc757b80..d3fe56d9 100755 --- a/tests/test_resize.sh +++ b/tests/test_resize.sh @@ -14,7 +14,7 @@ LD_PRELOAD="build/src/client/libfio_vitastor.so" \ qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:pool=1:inode=1:size=$((256*1024*1024))" \ - -O raw ./testdata/before.bin + -O raw ./testdata/bin/before.bin for i in $(seq 1 $OSD_COUNT); do pid=OSD${i}_PID @@ -23,19 +23,19 @@ for i in $(seq 1 $OSD_COUNT); do done for i in $(seq 1 $OSD_COUNT); do - offsets=$(build/src/disk_tool/vitastor-disk simple-offsets --format json ./testdata/test_osd$i.bin) + offsets=$(build/src/disk_tool/vitastor-disk simple-offsets --format json ./testdata/bin/test_osd$i.bin) meta_offset=$(echo $offsets | jq -r .meta_offset) data_offset=$(echo $offsets | jq -r .data_offset) - build/src/disk_tool/vitastor-disk dump-journal --json ./testdata/test_osd$i.bin 4096 0 $meta_offset >./testdata/journal_before_resize.json - build/src/disk_tool/vitastor-disk dump-meta ./testdata/test_osd$i.bin 4096 $meta_offset $((data_offset-meta_offset)) >./testdata/meta_before_resize.json + build/src/disk_tool/vitastor-disk dump-journal --json ./testdata/bin/test_osd$i.bin 4096 0 $meta_offset >./testdata/journal_before_resize.json + build/src/disk_tool/vitastor-disk dump-meta ./testdata/bin/test_osd$i.bin 4096 $meta_offset $((data_offset-meta_offset)) >./testdata/meta_before_resize.json build/src/disk_tool/vitastor-disk resize \ - $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) \ + $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/bin/test_osd$i.bin 2>/dev/null) \ --new_meta_offset 0 \ --new_meta_len $((1024*1024)) \ --new_journal_offset $((1024*1024)) \ --new_data_offset $((128*1024*1024)) - build/src/disk_tool/vitastor-disk dump-journal --json ./testdata/test_osd$i.bin 4096 $((1024*1024)) $((127*1024*1024)) >./testdata/journal_after_resize.json - build/src/disk_tool/vitastor-disk dump-meta ./testdata/test_osd$i.bin 4096 0 $((1024*1024)) >./testdata/meta_after_resize.json + build/src/disk_tool/vitastor-disk dump-journal --json ./testdata/bin/test_osd$i.bin 4096 $((1024*1024)) $((127*1024*1024)) >./testdata/journal_after_resize.json + build/src/disk_tool/vitastor-disk dump-meta ./testdata/bin/test_osd$i.bin 4096 0 $((1024*1024)) >./testdata/meta_after_resize.json if ! (cat ./testdata/meta_before_resize.json ./testdata/meta_after_resize.json | \ jq -e -s 'map([ .entries[] | del(.block) ] | sort_by(.pool, .inode, .stripe)) | .[0] == .[1] and (.[0] | length) > 1000'); then format_error "OSD $i metadata corrupted after resizing" @@ -50,7 +50,7 @@ $ETCDCTL del --prefix /vitastor/osd/state/ for i in $(seq 1 $OSD_COUNT); do build/src/osd/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $NO_SAME $OSD_ARGS --etcd_address $ETCD_URL \ - --data_device ./testdata/test_osd$i.bin \ + --data_device ./testdata/bin/test_osd$i.bin \ --meta_offset 0 \ --journal_offset $((1024*1024)) \ --data_offset $((128*1024*1024)) >>./testdata/osd$i.log 2>&1 & @@ -59,9 +59,9 @@ done qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:pool=1:inode=1:size=$((256*1024*1024))" \ - -O raw ./testdata/after.bin + -O raw ./testdata/bin/after.bin -if ! cmp ./testdata/before.bin ./testdata/after.bin; then +if ! cmp ./testdata/bin/before.bin ./testdata/bin/after.bin; then format_error "Data differs after resizing" fi diff --git a/tests/test_scrub.sh b/tests/test_scrub.sh index 66ae19d3..b14cb637 100755 --- a/tests/test_scrub.sh +++ b/tests/test_scrub.sh @@ -18,7 +18,7 @@ $ETCDCTL put /vitastor/config/inode/1/1 '{"name":"testimg","size":'$((IMG_SIZE*1 # Write LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=1M -direct=1 -iodepth=4 \ - -mirror_file=./testdata/mirror.bin -end_fsync=1 -rw=write -etcd=$ETCD_URL -image=testimg + -mirror_file=./testdata/bin/mirror.bin -end_fsync=1 -rw=write -etcd=$ETCD_URL -image=testimg # Save PG primary primary=$($ETCDCTL get --print-value-only /vitastor/pg/config | jq -r '.items["1"]["1"].primary') @@ -28,9 +28,9 @@ zero_osd_pid=OSD${ZERO_OSD}_PID kill ${!zero_osd_pid} sleep 1 kill -9 ${!zero_osd_pid} || true -data_offset=$(build/src/disk_tool/vitastor-disk simple-offsets ./testdata/test_osd$ZERO_OSD.bin $OFFSET_ARGS | grep data_offset | awk '{print $2}') -truncate -s $data_offset ./testdata/test_osd$ZERO_OSD.bin -dd if=/dev/zero of=./testdata/test_osd$ZERO_OSD.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) +data_offset=$(build/src/disk_tool/vitastor-disk simple-offsets ./testdata/bin/test_osd$ZERO_OSD.bin $OFFSET_ARGS | grep data_offset | awk '{print $2}') +truncate -s $data_offset ./testdata/bin/test_osd$ZERO_OSD.bin +dd if=/dev/zero of=./testdata/bin/test_osd$ZERO_OSD.bin bs=1024 count=1 seek=$((OSD_SIZE*1024-1)) $ETCDCTL del /vitastor/osd/state/$ZERO_OSD start_osd $ZERO_OSD @@ -64,8 +64,8 @@ fi # Read everything back qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \ - -O raw ./testdata/read.bin + -O raw ./testdata/bin/read.bin -diff ./testdata/read.bin ./testdata/mirror.bin +diff ./testdata/bin/read.bin ./testdata/bin/mirror.bin format_green OK diff --git a/tests/test_snapshot.sh b/tests/test_snapshot.sh index 957a0218..fef1ed84 100755 --- a/tests/test_snapshot.sh +++ b/tests/test_snapshot.sh @@ -34,21 +34,21 @@ qemu-img convert -p \ qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:pool=1:inode=3:size=$((32*1024*1024))" \ - -O raw ./testdata/merged.bin + -O raw ./testdata/bin/merged.bin qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg@0" \ - -O raw ./testdata/layer0.bin + -O raw ./testdata/bin/layer0.bin $ETCDCTL put /vitastor/config/inode/1/3 '{"name":"testimg","size":'$((32*1024*1024))'}' qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \ - -O raw ./testdata/layer1.bin + -O raw ./testdata/bin/layer1.bin -node tests/merge.js ./testdata/layer0.bin ./testdata/layer1.bin ./testdata/check.bin +node tests/merge.js ./testdata/bin/layer0.bin ./testdata/bin/layer1.bin ./testdata/bin/check.bin -cmp ./testdata/merged.bin ./testdata/check.bin +cmp ./testdata/bin/merged.bin ./testdata/bin/check.bin # Test merge @@ -58,22 +58,22 @@ build/src/cmd/vitastor-cli rm --etcd_address $ETCD_URL testimg@0 qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \ - -O raw ./testdata/merged-by-tool.bin + -O raw ./testdata/bin/merged-by-tool.bin -cmp ./testdata/merged.bin ./testdata/merged-by-tool.bin +cmp ./testdata/bin/merged.bin ./testdata/bin/merged-by-tool.bin # Test merge by qemu-img qemu-img rebase -u -b layer0.qcow2 -F qcow2 ./testdata/layer1.qcow2 -qemu-img convert -S 4096 -f qcow2 ./testdata/layer1.qcow2 -O raw ./testdata/rebased.bin +qemu-img convert -S 4096 -f qcow2 ./testdata/layer1.qcow2 -O raw ./testdata/bin/rebased.bin -cmp ./testdata/merged.bin ./testdata/rebased.bin +cmp ./testdata/bin/merged.bin ./testdata/bin/rebased.bin qemu-img rebase -u -b '' ./testdata/layer1.qcow2 -qemu-img convert -S 4096 -f qcow2 ./testdata/layer1.qcow2 -O raw ./testdata/rebased.bin +qemu-img convert -S 4096 -f qcow2 ./testdata/layer1.qcow2 -O raw ./testdata/bin/rebased.bin -cmp ./testdata/layer1.bin ./testdata/rebased.bin +cmp ./testdata/bin/layer1.bin ./testdata/bin/rebased.bin format_green OK diff --git a/tests/test_snapshot_chain.sh b/tests/test_snapshot_chain.sh index 5bc06709..744c949e 100755 --- a/tests/test_snapshot_chain.sh +++ b/tests/test_snapshot_chain.sh @@ -9,7 +9,7 @@ build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create -s 32M testchain LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4M -direct=1 -iodepth=1 -fsync=1 -rw=write \ - -etcd=$ETCD_URL -image=testchain -mirror_file=./testdata/mirror.bin + -etcd=$ETCD_URL -image=testchain -mirror_file=./testdata/bin/mirror.bin for i in {1..10}; do # Create a snapshot @@ -17,18 +17,18 @@ for i in {1..10}; do # Check that the new snapshot is see-through qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \ - -O raw ./testdata/check.bin - cmp ./testdata/check.bin ./testdata/mirror.bin + -O raw ./testdata/bin/check.bin + cmp ./testdata/bin/check.bin ./testdata/bin/mirror.bin # Write something to it LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4k -direct=1 -iodepth=1 -fsync=32 -rw=randwrite \ -randrepeat=$((i <= 2)) -buffer_pattern=0x$((10+i))$((10+i))$((10+i))$((10+i)) \ - -etcd=$ETCD_URL -image=testchain -number_ios=1024 -mirror_file=./testdata/mirror.bin + -etcd=$ETCD_URL -image=testchain -number_ios=1024 -mirror_file=./testdata/bin/mirror.bin # Check the new content qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \ - -O raw ./testdata/layer1.bin - cmp ./testdata/layer1.bin ./testdata/mirror.bin + -O raw ./testdata/bin/layer1.bin + cmp ./testdata/bin/layer1.bin ./testdata/bin/mirror.bin done build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@1 testchain@9 @@ -36,13 +36,13 @@ build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@1 testchain@9 # Check the final image qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \ - -O raw ./testdata/layer1.bin -cmp ./testdata/layer1.bin ./testdata/mirror.bin + -O raw ./testdata/bin/layer1.bin +cmp ./testdata/bin/layer1.bin ./testdata/bin/mirror.bin # Check the last remaining snapshot qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain@10" \ - -O raw ./testdata/layer0.bin -cmp ./testdata/layer0.bin ./testdata/check.bin + -O raw ./testdata/bin/layer0.bin +cmp ./testdata/bin/layer0.bin ./testdata/bin/check.bin format_green OK diff --git a/tests/test_snapshot_down.sh b/tests/test_snapshot_down.sh index 5145b27a..9a5e6af3 100755 --- a/tests/test_snapshot_down.sh +++ b/tests/test_snapshot_down.sh @@ -9,7 +9,7 @@ build/src/cmd/vitastor-cli --etcd_address $ETCD_URL create -s 128M testchain LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=4M -direct=1 -iodepth=1 -fsync=1 -rw=write \ - -etcd=$ETCD_URL -image=testchain -mirror_file=./testdata/mirror.bin + -etcd=$ETCD_URL -image=testchain -mirror_file=./testdata/bin/mirror.bin # Create a snapshot build/src/cmd/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@0 @@ -17,13 +17,13 @@ build/src/cmd/vitastor-cli --etcd_address $ETCD_URL snap-create testchain@0 # Write something to it LD_PRELOAD="build/src/client/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/client/libfio_vitastor.so -bs=1M -direct=1 -iodepth=4 -rw=randwrite \ - -randrepeat=0 -etcd=$ETCD_URL -image=testchain -number_ios=8 -mirror_file=./testdata/mirror.bin + -randrepeat=0 -etcd=$ETCD_URL -image=testchain -number_ios=8 -mirror_file=./testdata/bin/mirror.bin # Check the new content qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \ - -O raw ./testdata/layer1.bin -cmp ./testdata/layer1.bin ./testdata/mirror.bin + -O raw ./testdata/bin/layer1.bin +cmp ./testdata/bin/layer1.bin ./testdata/bin/mirror.bin # Merge build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@0 @@ -31,7 +31,7 @@ build/src/cmd/vitastor-cli --etcd_address $ETCD_URL rm testchain@0 # Check the final image qemu-img convert -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testchain" \ - -O raw ./testdata/layer1.bin -cmp ./testdata/layer1.bin ./testdata/mirror.bin + -O raw ./testdata/bin/layer1.bin +cmp ./testdata/bin/layer1.bin ./testdata/bin/mirror.bin format_green OK diff --git a/tests/test_splitbrain.sh b/tests/test_splitbrain.sh index f89a2284..aa7767f8 100755 --- a/tests/test_splitbrain.sh +++ b/tests/test_splitbrain.sh @@ -23,7 +23,7 @@ LD_PRELOAD="build/src/client/libfio_vitastor.so" \ kill $OSD2_PID build/src/osd/vitastor-osd --osd_num 1 --bind_address 127.0.0.1 $NO_SAME $OSD_ARGS --etcd_address $ETCD_URL \ - $(build/src/disk_tool/vitastor-disk simple-offsets --format options --device ./testdata/test_osd2.bin 2>/dev/null) >>./testdata/osd2.log 2>&1 & + $(build/src/disk_tool/vitastor-disk simple-offsets --format options --device ./testdata/bin/test_osd2.bin 2>/dev/null) >>./testdata/osd2.log 2>&1 & sleep 2 # Check PG state - it should NOT become active diff --git a/tests/test_vm_cont.sh b/tests/test_vm_cont.sh index aab6aa12..e0dcedd0 100755 --- a/tests/test_vm_cont.sh +++ b/tests/test_vm_cont.sh @@ -15,7 +15,7 @@ OSD_COUNT=3 OSD_ARGS="$OSD_ARGS" OFFSET_ARGS="$OFFSET_ARGS" for i in $(seq 1 $OSD_COUNT); do - build/src/osd/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & + build/src/osd/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/disk_tool/vitastor-disk simple-offsets --format options ./testdata/bin/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! done diff --git a/tests/test_write.sh b/tests/test_write.sh index e253a517..c82a0b26 100755 --- a/tests/test_write.sh +++ b/tests/test_write.sh @@ -43,10 +43,10 @@ LD_PRELOAD="build/src/client/libfio_vitastor.so" \ qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:pool=1:inode=1:size=$((128*1024*1024))" \ - -O raw ./testdata/read.bin + -O raw ./testdata/bin/read.bin qemu-img convert -S 4096 -p \ - -f raw ./testdata/read.bin \ + -f raw ./testdata/bin/read.bin \ -O raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:pool=1:inode=1:size=$((128*1024*1024))" format_green OK