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

Prevent metaslab_sync panic due to spa_final_dirty_txg #9231

Merged
merged 2 commits into from
Aug 30, 2019
Merged

Prevent metaslab_sync panic due to spa_final_dirty_txg #9231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f660625
Prevent metaslab_sync panic due to spa_final_dirty_txg
pcd1193182 Aug 28, 2019
2d5d5df
Matt comment feedback
pcd1193182 Aug 29, 2019
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
11 changes: 9 additions & 2 deletions module/zfs/metaslab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3552,12 +3552,19 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
/*
* Normally, we don't want to process a metaslab if there are no
* allocations or frees to perform. However, if the metaslab is being
* forced to condense and it's loaded, we need to let it through.
* forced to condense, it's loaded and we're not beyond the final
* dirty txg, we need to let it through. Not condensing beyond the
* final dirty txg prevents an issue where metaslabs that need to be
* condensed but were loaded for other reasons could cause a panic
* here. By only checking the txg in that branch of the conditional,
* we preserve the utility of the VERIFY statements in all other
* cases.
*/
if (range_tree_is_empty(alloctree) &&
range_tree_is_empty(msp->ms_freeing) &&
range_tree_is_empty(msp->ms_checkpointing) &&
!(msp->ms_loaded && msp->ms_condense_wanted))
!(msp->ms_loaded && msp->ms_condense_wanted &&
txg <= spa_final_dirty_txg(spa)))
return;


Expand Down
8 changes: 3 additions & 5 deletions tests/runfiles/linux.run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,15 +481,13 @@ tests = ['zpool_trim_attach_detach_add_remove',
tags = ['functional', 'zpool_trim']

[tests/functional/cli_root/zpool_upgrade]
tests = ['zpool_upgrade_001_pos',
tests = ['zpool_upgrade_001_pos', 'zpool_upgrade_002_pos',
'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos',
'zpool_upgrade_005_neg', 'zpool_upgrade_006_neg',
'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',
'zpool_upgrade_009_neg']
tags = ['functional', 'cli_root', 'zpool_upgrade']

# Disabled pending resolution of #9185 and #9186.
# 'zpool_upgrade_002_pos', 'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos',
# 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',

[tests/functional/cli_user/misc]
tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
'zfs_clone_001_neg', 'zfs_create_001_neg', 'zfs_destroy_001_neg',
Expand Down