Skip to content

Commit d8526e8

Browse files
author
Paul Dagnelie
committed
Fix test failures
Signed-off-by: Paul Dagnelie <[email protected]>
1 parent 8fc80cf commit d8526e8

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

cmd/zdb/zdb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9114,7 +9114,8 @@ zdb_read_block(char *thing, spa_t *spa)
91149114

91159115
if ((zio_checksum_table[ck].ci_flags &
91169116
ZCHECKSUM_FLAG_EMBEDDED) ||
9117-
ck == ZIO_CHECKSUM_NOPARITY) {
9117+
ck == ZIO_CHECKSUM_NOPARITY ||
9118+
ck == ZIO_CHECKSUM_ANYRAID_MAP) {
91189119
continue;
91199120
}
91209121
BP_SET_CHECKSUM(bp, ck);

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ DISK2="$(echo $DISKS | cut -d' ' -f2)"
3939
for type in "mirror" "anyraid1"; do
4040
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2
4141
if [[ "$type" == "anyraid1" ]]; then
42-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=3k
42+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
4343
log_must zpool sync
4444
log_must rm /$TESTPOOL/f1
4545
fi

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_start_and_cancel_neg.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ for type in "" "anyraid2"; do
4949
log_must zpool list -v
5050
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2 $DISK3
5151
if [[ "$type" == "anyraid2" ]]; then
52-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=3k
52+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
5353
log_must zpool sync
5454
log_must rm /$TESTPOOL/f1
5555
fi

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_uninit.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ for type in "" "anyraid1"; do
8585
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2 $DISK3
8686
status_check_all $TESTPOOL "uninitialized"
8787
if [[ "$type" == "anyraid1" ]]; then
88-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=4k
88+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
8989
log_must zpool sync
9090
log_must rm /$TESTPOOL/f1
9191
fi

0 commit comments

Comments
 (0)