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

ZTS: checkpoint_discard_busy should use save_tunable/restore_tunable #16919

Merged
merged 1 commit into from
Jan 3, 2025
Merged

ZTS: checkpoint_discard_busy should use save_tunable/restore_tunable #16919

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
9 changes: 5 additions & 4 deletions tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_discard_busy.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ log_unsupported "Skipping, issue https://github.com/openzfs/zfs/issues/12053"

function test_cleanup
{
# reset memory limit to 16M
set_tunable64 SPA_DISCARD_MEMORY_LIMIT 16777216
# reset to original value
log_must restore_tunable SPA_DISCARD_MEMORY_LIMIT
cleanup_nested_pools
}

Expand All @@ -69,6 +69,7 @@ log_onexit test_cleanup
# map, we should have even more time to
# verify this.
#
log_must save_tunable SPA_DISCARD_MEMORY_LIMIT
set_tunable64 SPA_DISCARD_MEMORY_LIMIT 128

log_must zpool checkpoint $NESTEDPOOL
Expand Down Expand Up @@ -101,8 +102,8 @@ log_mustnot zpool checkpoint -d $NESTEDPOOL
log_mustnot zpool remove $NESTEDPOOL $FILEDISK1
log_mustnot zpool reguid $NESTEDPOOL

# reset memory limit to 16M
set_tunable64 SPA_DISCARD_MEMORY_LIMIT 16777216
# reset to original value
log_must restore_tunable SPA_DISCARD_MEMORY_LIMIT

nested_wait_discard_finish

Expand Down
Loading