diff options
| -rwxr-xr-x | root_image | 4 | ||||
| -rw-r--r-- | tests/fs/bcachefs/bcachefs-test-libs.sh | 2 | ||||
| -rwxr-xr-x | tests/fs/bcachefs/replication.ktest | 71 | ||||
| -rwxr-xr-x | tests/fs/bcachefs/single_device.ktest | 84 | ||||
| -rwxr-xr-x | tests/fs/bcachefs/tier.ktest | 2 |
5 files changed, 138 insertions, 25 deletions
@@ -81,12 +81,12 @@ PACKAGES=(kexec-tools less psmisc openssh-server curl \ hdparm mdadm lvm2 \ btrfs-progs jfsutils nilfs-tools f2fs-tools \ bc attr gawk acl rsync git python3-docutils \ - stress-ng lsof xxd) + stress-ng lsof xxd zstd) # build tools: PACKAGES+=(build-essential make gcc g++ clang) PACKAGES+=(autoconf automake autopoint bison) -PACKAGES+=(cargo) +PACKAGES+=(cargo mold) PACKAGES+=(devscripts debhelper) # stress testing: diff --git a/tests/fs/bcachefs/bcachefs-test-libs.sh b/tests/fs/bcachefs/bcachefs-test-libs.sh index 375baaf..db17607 100644 --- a/tests/fs/bcachefs/bcachefs-test-libs.sh +++ b/tests/fs/bcachefs/bcachefs-test-libs.sh @@ -191,7 +191,7 @@ get_slowpath_counters() bcachefs show-super --field-only counters "$dev"| grep -E '(fail|restart|blocked|full)'| - grep -vE '(path_relock_fail|mem_realloced|trans_restart_injected|io_move_write_fail|and_poison|write_buffer_flush)'| + grep -vE '(btree_path|mem_realloced|trans_restart_injected|io_move_write_fail|and_poison|write_buffer_flush)'| grep -v ' 0$' || true } diff --git a/tests/fs/bcachefs/replication.ktest b/tests/fs/bcachefs/replication.ktest index 3771cca..3fece71 100755 --- a/tests/fs/bcachefs/replication.ktest +++ b/tests/fs/bcachefs/replication.ktest @@ -425,10 +425,10 @@ test_device_set_state_offline() mount -t bcachefs ${ktest_scratch_dev[0]}:${ktest_scratch_dev[1]}:${ktest_scratch_dev[2]} /mnt local fioout="$ktest_out/fio-out" - run_fio_randrw >"$fioout" 2>&1 & + run_fio_randrw --runtime=60 >"$fioout" 2>&1 & local fiopid=$! - sleep 1 + sleep 10 bcachefs device set-state --force ro ${ktest_scratch_dev[1]} @@ -460,10 +460,10 @@ test_device_readd() mount -t bcachefs ${ktest_scratch_dev[0]}:${ktest_scratch_dev[1]} /mnt local fioout="$ktest_out/fio-out" - run_fio_randrw >"$fioout" 2>&1 & + run_fio_randrw --runtime=60 >"$fioout" 2>&1 & local fiopid=$! - sleep 1 + sleep 10 echo -n "offlining ${ktest_scratch_dev[0]}... " bcachefs device offline --force ${ktest_scratch_dev[0]} @@ -837,6 +837,69 @@ test_rereplicate() bcachefs_test_end_checks ${ktest_scratch_dev[0]} } +test_rereplicate2() +{ + echo ":: format with replicas=1 (default)" + run_quiet "" bcachefs format -f \ + ${ktest_scratch_dev[0]} \ + ${ktest_scratch_dev[1]} + + mount -t bcachefs ${ktest_scratch_dev[0]}:${ktest_scratch_dev[1]} /mnt + + echo ":: write to fs, while replicas=1" + touch /mnt/empty-file + + echo ":: we should have some durability=1 data now" + bcachefs fs usage -h /mnt + + echo ":: set replicas=2 and run rereplicate" + echo 2 > /sys/fs/bcachefs/*/options/data_replicas + echo 2 > /sys/fs/bcachefs/*/options/metadata_replicas + bcachefs data rereplicate /mnt + + # echo ":: running rereplicate a second time seems to guarantee all data has durability=2" + # bcachefs data rereplicate /mnt + + echo ":: all data should be replicated to both devices now, verifying..." + local fs_usage_out=$(bcachefs fs usage -h /mnt) + echo "$fs_usage_out" + local residual_durability_1_data=$(grep -E '^(btree|user):' <<<"$fs_usage_out" | awk '$3 == "1"') + + umount /mnt + + local dev_remove= + if ! [[ -n "$residual_durability_1_data" ]]; then + echo ":: no residual durability=1 data found" + dev_remove="vdb" + echo ":: we will simulate loss of device '$dev_remove' to verify proper replication" + else + echo ":: found residual durability=1 data:" + echo "$residual_durability_1_data" + + local first_spof_dev=$(head -n1 <<<"$residual_durability_1_data" | grep -oP '\[\K[^\]]+' | awk '{print $1}') + dev_remove="$first_spof_dev" + echo ":: we will simulate loss of device '$dev_remove', which we suspect of being a single-point-of-failure" + fi + + # we want to keep the other device + local dev_keep= + if [[ "$dev_remove" == "vdb" ]]; then + dev_keep="vdc" + elif [[ "$dev_remove" == "vdc" ]]; then + dev_keep="vdb" + else + exit 1 + fi + + echo ":: wipe the super-block on device '$dev_remove' to prevent auto-discovery durring mount" + dd if=/dev/zero of=/dev/$dev_remove bs=1M count=1 oflag=direct + + echo ":: attempt degraded mount with only device '$dev_keep'" + mount -t bcachefs -o degraded,fsck,fix_errors /dev/$dev_keep /mnt + + umount /mnt +} + disabled_test_device_add_faults() { setup_tracing 'bcachefs:*' diff --git a/tests/fs/bcachefs/single_device.ktest b/tests/fs/bcachefs/single_device.ktest index 040efa4..0316b7c 100755 --- a/tests/fs/bcachefs/single_device.ktest +++ b/tests/fs/bcachefs/single_device.ktest @@ -256,7 +256,7 @@ test_reflink2() test_reflink() { - set_watchdog 10 + set_watchdog 60 run_quiet "" bcachefs format -f --errors=panic ${ktest_scratch_dev[0]} mount -t bcachefs ${ktest_scratch_dev[0]} /mnt @@ -644,7 +644,7 @@ test_recovery() run_quiet "" bcachefs format -f \ --errors=panic \ --encrypted --no_passphrase \ - --bucket_size=8k \ + --bucket_size=64k \ ${ktest_scratch_dev[0]} for i in `seq 0 1`; do @@ -1322,7 +1322,24 @@ check_rsync_log() # Sample expected output: # .d..t...... ./ # .d..t...... lost+found/ - ! grep -E '^[^.]' $1 + ! grep -v "cd+++++++++ lost+found/" $1| grep -E '^[^.]' +} + +verify_trees_equal() +{ + local dir1=$1 + local dir2=$2 + + rsync --archive \ + --acls \ + --xattrs \ + --checksum \ + --hard-links \ + --dry-run \ + --itemize-changes \ + $dir1/ $dir2/ > /root/rsynclog-build + + check_rsync_log /root/rsynclog-build } # build a filesystem from a source @@ -1334,25 +1351,14 @@ build_from_fs() prepare_source_fs $1 bcachefs format -f \ - --source=/mnt ${ktest_scratch_dev[1]} | tee /root/buildlog + --source=/mnt ${ktest_scratch_dev[1]} echo "Attempting to mount bcachefs filesystem" if true; then mkdir -p /mnt2 mount -t bcachefs -o noexcl,nochanges,ro ${ktest_scratch_dev[1]} /mnt2 - - rsync --archive \ - --acls \ - --xattrs \ - --checksum \ - --hard-links \ - --dry-run \ - --itemize-changes \ - /mnt/ /mnt2/ > /root/rsynclog-build - - check_rsync_log /root/rsynclog-build - + verify_trees_equal /mnt /mnt2 umount /mnt2 echo "rsync passed" fi @@ -1883,7 +1889,7 @@ test_kernel_fsck() test_online_fsck() { - set_watchdog 10 + set_watchdog 30 bcachefs format -f ${ktest_scratch_dev[0]} mount -t bcachefs ${ktest_scratch_dev[0]} /mnt @@ -2023,4 +2029,48 @@ test_casefold_overlayfs() bcachefs fsck -ny ${ktest_scratch_dev[0]} } +test_image_create() +{ + local IMAGE_FILE=/root/usr.image + + check_image() + { + echo "--- FSCK IMAGE ---" + echo + bcachefs fsck -ny $IMAGE_FILE + + ls -l $IMAGE_FILE + + echo "--- MOUNT CHECK IMAGE ---" + echo + mount $IMAGE_FILE /mnt + verify_trees_equal /mnt $1 + umount /mnt + } + + #run_quiet "" bcachefs format -f ${ktest_scratch_dev[0]} + #mount -t bcachefs ${ktest_scratch_dev[0]} /mnt + + rm -f $IMAGE_FILE + + echo "--- CREATE IMAGE ---" + echo + #bcachefs image create --compression=zstd --source=/usr $IMAGE_FILE + bcachefs image create --source=/usr $IMAGE_FILE + + check_image /usr + + echo "--- UPDATE IMAGE /usr ---" + echo + bcachefs image update --source=/usr $IMAGE_FILE + + check_image /usr + + echo "--- UPDATE IMAGE /usr/bin ---" + echo + bcachefs image update --source=/usr/bin $IMAGE_FILE + + check_image /usr/bin +} + main "$@" diff --git a/tests/fs/bcachefs/tier.ktest b/tests/fs/bcachefs/tier.ktest index daff7cc..4723ad2 100755 --- a/tests/fs/bcachefs/tier.ktest +++ b/tests/fs/bcachefs/tier.ktest @@ -415,7 +415,7 @@ test_metadata_on_wrong_device_after_disk_add_v2() test_recover_super() { - set_watchdog 60 + set_watchdog 120 run_quiet "" bcachefs format -f \ --errors=panic \ ${ktest_scratch_dev[@]} |