diff --git a/tests/common.sh b/tests/common.sh index 6cd39f0d..2b4a8f3f 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -64,4 +64,4 @@ echo leak:librbd >> testdata/lsan-suppress.txt echo leak:_M_mutate >> testdata/lsan-suppress.txt echo leak:_M_assign >> testdata/lsan-suppress.txt export LSAN_OPTIONS=report_objects=true:suppressions=`pwd`/testdata/lsan-suppress.txt -export ASAN_OPTIONS=verify_asan_link_order=false +export ASAN_OPTIONS=verify_asan_link_order=false:abort_on_error=1 diff --git a/tests/run_3osds.sh b/tests/run_3osds.sh index 11f84e3e..07cd5234 100644 --- a/tests/run_3osds.sh +++ b/tests/run_3osds.sh @@ -17,17 +17,17 @@ else fi if [ "$IMMEDIATE_COMMIT" != "" ]; then - NO_SAME="--journal_no_same_sector_overwrites true --journal_sector_buffer_count 1024 --disable_data_fsync 1 --immediate_commit all --log_level 1" + NO_SAME="--journal_no_same_sector_overwrites true --journal_sector_buffer_count 1024 --disable_data_fsync 1 --immediate_commit all --log_level 10" $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"osd_out_time":1,"immediate_commit":"all"}' else - NO_SAME="--journal_sector_buffer_count 1024 --log_level 1" + NO_SAME="--journal_sector_buffer_count 1024 --log_level 10" $ETCDCTL put /vitastor/config/global '{"recovery_queue_depth":1,"osd_out_time":1}' fi start_osd() { local i=$1 - build/src/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $NO_SAME $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) &>./testdata/osd$i.log & + build/src/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $NO_SAME $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! } diff --git a/tests/test_heal.sh b/tests/test_heal.sh index c309f9cf..09428139 100755 --- a/tests/test_heal.sh +++ b/tests/test_heal.sh @@ -43,7 +43,7 @@ kill_osds & LD_PRELOAD="build/src/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/libfio_vitastor.so -bs=4k -direct=1 -iodepth=16 -fsync=256 -rw=randwrite \ - -mirror_file=./testdata/mirror.bin -etcd=$ETCD_URL -image=testimg -loops=10 -runtime=120 2>/dev/null + -mirror_file=./testdata/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" \ diff --git a/tests/test_move_reappear.sh b/tests/test_move_reappear.sh index 59abfe85..6515fbb5 100755 --- a/tests/test_move_reappear.sh +++ b/tests/test_move_reappear.sh @@ -7,7 +7,7 @@ OSD_COUNT=5 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/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) &>./testdata/osd$i.log & + build/src/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! done diff --git a/tests/test_resize.sh b/tests/test_resize.sh index fdc05814..ed6d2c5d 100755 --- a/tests/test_resize.sh +++ b/tests/test_resize.sh @@ -53,7 +53,7 @@ for i in $(seq 1 $OSD_COUNT); do --data_device ./testdata/test_osd$i.bin \ --meta_offset 0 \ --journal_offset $((1024*1024)) \ - --data_offset $((128*1024*1024)) &>./testdata/osd$i.log & + --data_offset $((128*1024*1024)) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! done diff --git a/tests/test_splitbrain.sh b/tests/test_splitbrain.sh index b992481e..bffc89d6 100755 --- a/tests/test_splitbrain.sh +++ b/tests/test_splitbrain.sh @@ -21,7 +21,8 @@ LD_PRELOAD="build/src/libfio_vitastor.so" \ # Kill OSD 2, start OSD 1 kill $OSD2_PID -build/src/vitastor-osd --osd_num 1 --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options --device ./testdata/test_osd2.bin 2>/dev/null) >>./testdata/osd2.log 2>&1 & +build/src/vitastor-osd --osd_num 1 --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL \ + $(build/src/vitastor-disk simple-offsets --format options --device ./testdata/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 5431c917..fdded344 100755 --- a/tests/test_vm_cont.sh +++ b/tests/test_vm_cont.sh @@ -10,7 +10,7 @@ etcdctl --endpoints=http://127.0.0.1:12379/v3 del --prefix /vitastor/osd/state OSD_COUNT=3 OSD_ARGS= for i in $(seq 1 $OSD_COUNT); do - build/src/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) &>./testdata/osd$i.log & + build/src/vitastor-osd --osd_num $i --bind_address 127.0.0.1 $OSD_ARGS --etcd_address $ETCD_URL $(build/src/vitastor-disk simple-offsets --format options ./testdata/test_osd$i.bin 2>/dev/null) >>./testdata/osd$i.log 2>&1 & eval OSD${i}_PID=$! done