btrfs-progs: Reduce error level from error to warning for OPEN_CTREE_PARTIAL
PATCH 1/2 btrfs-progs: Reduce error level from error to warning for OPEN_CTREE_PARTIAL
Even if we're using OPEN_CTREE_PARTIAL, like "rescue zero log", the error message still looks too serious even we skipped that tree:
bad tree block 2172747776, bytenr mismatch, want=2172747776, have=0
Couldn't setup extent tree
^^^^^^^^^^^^^^^^^^^^^^^^^^This patch will change the error message to:
- Use error() if we're not using OPEN_CTREE_PARTIAL
- Use warning() and explicitly show we're skipping that tree
So the result would be something like:
For non-OPEN_CTREE_PARTIAL case:
bad tree block 2172747776, bytenr mismatch, want=2172747776, have=0
ERROR: could not setup extent tree
For OPEN_CTREE_PARTIAL case
bad tree block 2172747776, bytenr mismatch, want=2172747776, have=0
WARNING: could not setup extent tree, skipping it
--- disk-io.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
disk-io.c +4 -2
@@ -886,9 +886,11 @@ static int setup_root_or_create_block(struct btrfs_fs_info *fs_info, ret =find_and_setup_root (root, fs_info, objectid, info_root);if (ret) { -printk ("Couldn't setup %s tree\n" , str); -if (!(flags &OPEN_CTREE_PARTIAL )) +if (!(flags &OPEN_CTREE_PARTIAL )) { +error ("could not setup %s tree" , str);return -EIO ; + } +warning ("could not setup %s tree, skipping it" , str);/* * Need a blank node here just so we don't screw up in the * million of places that assume a root has a valid ->node
Signature · 1 line
2.24.0
PATCH 2/2 btrfs: rescue/zero-log: Manually write all supers to handle extent tree error more gracefully
[BUG]
Even "btrfs rescue zero-log" only reset btrfs_super_block::log_root and btrfs_super_block::log_root_level, we still use trasction to write all super blocks for all devices.
This means we can't handle things like corrupted extent tree:
checksum verify failed on 2172747776 found 000000B6 wanted 00000000 checksum verify failed on 2172747776 found 000000B6 wanted 00000000 bad tree block 2172747776, bytenr mismatch, want=2172747776, have=0
WARNING: could not setup extent tree, skipping it Clearing log on /dev/nvme/btrfs, previous log_root 0, level 0
ERROR: Corrupted fs, no valid METADATA block group found
ERROR: attempt to start transaction over already running one
[CAUSE]
Because we have extra check in transaction code to ensure we have valid METADATA block groups.
In fact we don't really need transaction at all.
[FIX]
Instead of commit transaction, we can just call write_all_supers() manually, so we can still handle multi-device fs while avoid above error.
Also, add OPEN_CTREE_NO_BLOCK_GROUPS open ctree flag to make it more robust.
--- cmds/rescue.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
cmds/rescue.c +7 -6
@@ -165,7 +165,6 @@ static int cmd_rescue_zero_log(const struct cmd_struct *cmd, int argc, char **argv) { struct btrfs_root *root; -struct btrfs_trans_handle *trans;struct btrfs_super_block *sb;char *devname;int ret;
@@ -187,7 +186,8 @@ static int cmd_rescue_zero_log(const struct cmd_struct *cmd, goto out; } - root =open_ctree (devname,0 ,OPEN_CTREE_WRITES |OPEN_CTREE_PARTIAL ); + root =open_ctree (devname,0 ,OPEN_CTREE_WRITES |OPEN_CTREE_PARTIAL | +OPEN_CTREE_NO_BLOCK_GROUPS );if (!root) {error ("could not open ctree" );return 1 ;
@@ -198,13 +198,14 @@ static int cmd_rescue_zero_log(const struct cmd_struct *cmd, devname, (unsigned long long )btrfs_super_log_root (sb), (unsigned)btrfs_super_log_root_level(sb)); - trans =btrfs_start_transaction (root,1 ); -BUG_ON (IS_ERR (trans));btrfs_set_super_log_root (sb,0 );btrfs_set_super_log_root_level (sb,0 ); -btrfs_commit_transaction (trans, root); + ret =write_all_supers (root->fs_info); +if (ret <0 ) { + errno = -ret; +error ("failed to write dev supers: %m" ); + }close_ctree (root); - out:return !!ret; }
Signature · 1 line
2.24.0
Re: [PATCH 2/2] btrfs: rescue/zero-log: Manually write all supers to handle extent tree error more gracefully
Quoted 26 lines · Qu Wenruo
[BUG]
Even "btrfs rescue zero-log" only resetbtrfs_super_block::log_rootandbtrfs_super_block::log_root_level, we still use trasction to write all super blocks for all devices.This means we can't handle things like corrupted extent tree:
checksum verify failed on 2172747776 found 000000B6 wanted 00000000 checksum verify failed on 2172747776 found 000000B6 wanted 00000000 bad tree block 2172747776, bytenr mismatch, want=2172747776, have=0
WARNING: could not setup extent tree, skipping it Clearing log on/dev/nvme/btrfs, previouslog_root0, level 0
ERROR: Corrupted fs, no valid METADATA block group found
ERROR: attempt to start transaction over already running one[CAUSE]
Because we have extra check in transaction code to ensure we have valid METADATA block groups.In fact we don't really need transaction at all.
[FIX]
Instead of commit transaction, we can just callwrite_all_supers()manually, so we can still handle multi-device fs while avoid above error.
Quoted 5 lines
Also, add
OPEN_CTREE_NO_BLOCK_GROUPSopen ctree flag to make it more robust.Reported-by Christian Pernegger <[email protected]>Signed-off-by Qu Wenruo <[email protected]>
Thanks, v1 has been replaced.