Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

persistent L2ARC minor fixes #10210

Merged
merged 1 commit into from
Apr 17, 2020
Merged

persistent L2ARC minor fixes #10210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/zdb/zdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3606,8 +3606,7 @@ dump_l2arc_log_blocks(int fd, l2arc_dev_hdr_phys_t l2dhdr)
}

if (this_lb.lb_magic == BSWAP_64(L2ARC_LOG_BLK_MAGIC))
byteswap_uint64_array(&this_lb, psize);

byteswap_uint64_array(&this_lb, sizeof (this_lb));
gamanakis marked this conversation as resolved.
Show resolved Hide resolved
if (this_lb.lb_magic != L2ARC_LOG_BLK_MAGIC) {
(void) printf("Invalid log block magic\n\n");
break;
Expand Down
14 changes: 6 additions & 8 deletions module/zfs/arc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9578,6 +9578,7 @@ l2arc_log_blk_read(l2arc_dev_t *dev,
int err = 0;
zio_cksum_t cksum;
abd_t *abd = NULL;
uint64_t psize;

ASSERT(this_lbp != NULL && next_lbp != NULL);
ASSERT(this_lb != NULL && next_lb != NULL);
Expand Down Expand Up @@ -9616,8 +9617,8 @@ l2arc_log_blk_read(l2arc_dev_t *dev,
}

/* Make sure the buffer checks out */
fletcher_4_native(this_lb,
L2BLK_GET_PSIZE((this_lbp)->lbp_prop), NULL, &cksum);
psize = L2BLK_GET_PSIZE((this_lbp)->lbp_prop);
gamanakis marked this conversation as resolved.
Show resolved Hide resolved
fletcher_4_native(this_lb, psize, NULL, &cksum);
if (!ZIO_CHECKSUM_EQUAL(cksum, this_lbp->lbp_cksum)) {
ARCSTAT_BUMP(arcstat_l2_rebuild_abort_cksum_lb_errors);
zfs_dbgmsg("L2ARC log block cksum failed, offset: %llu, "
Expand All @@ -9633,14 +9634,11 @@ l2arc_log_blk_read(l2arc_dev_t *dev,
case ZIO_COMPRESS_OFF:
break;
case ZIO_COMPRESS_LZ4:
abd = abd_alloc_for_io(L2BLK_GET_PSIZE(
(this_lbp)->lbp_prop), B_TRUE);
abd_copy_from_buf_off(abd, this_lb, 0,
L2BLK_GET_PSIZE((this_lbp)->lbp_prop));
abd = abd_alloc_for_io(psize, B_TRUE);
abd_copy_from_buf_off(abd, this_lb, 0, psize);
if ((err = zio_decompress_data(
L2BLK_GET_COMPRESS((this_lbp)->lbp_prop),
abd, this_lb, L2BLK_GET_PSIZE((this_lbp)->lbp_prop),
sizeof (*this_lb))) != 0) {
abd, this_lb, psize, sizeof (*this_lb))) != 0) {
err = SET_ERROR(EINVAL);
goto cleanup;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_007_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ log_must fio $FIO_SCRIPTS/random_reads.fio

log_must zpool offline $TESTPOOL $VDEV_CACHE

sleep 5
sleep 10

typeset l2_rebuild_log_blk_start=$(get_arcstat l2_rebuild_log_blks)

Expand All @@ -81,7 +81,7 @@ typeset l2_dh_log_blk=$(zdb -l $VDEV_CACHE | grep log_blk_count | \

log_must zpool online $TESTPOOL $VDEV_CACHE

sleep 5
sleep 10

typeset l2_rebuild_log_blk_end=$(get_arcstat l2_rebuild_log_blks)

Expand Down