marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: check: warn users about the possible dangers of --repair 

The manual page of btrfsck clearly states 'btrfs check --repair' is a
dangerous operation.

Although this warning is in place users do not read the manual page
and/or are used to the behaviour of fsck utilities which repair the
filesystem, and thus potentially cause harm.

Similar to 'btrfs balance' without any filters, add a warning and a
countdown, so users can bail out before eventual corrupting the
filesystem more than it already is.

To override the timeout, let --force skip it and continue.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Johannes Thumshirn 2019-10-18 13:16:03 +02:00 committed by David Sterba
parent a517225ece
commit e388bf386b
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
check/main.c
View File

@ -10026,6 +10026,24 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
exit(1);
}
if (repair && !force) {
int delay = 10;
printf("WARNING:\n\n");
printf("\tDo not use --repair unless you are advised to do so by a developer\n");
printf("\tor an experienced user, and then only after having accepted that no\n");
printf("\tfsck can successfully repair all types of filesystem corruption. Eg.\n");
printf("\tsome software or hardware bugs can fatally damage a volume.\n");
printf("\tThe operation will start in %d seconds.\n", delay);
printf("\tUse Ctrl-C to stop it.\n");
while (delay) {
printf("%2d", delay--);
fflush(stdout);
sleep(1);
}
printf("\nStarting repair.\n");
}
/*
* experimental and dangerous
*/
@ -10054,12 +10072,6 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
goto err_out;
}
} else {
if (repair) {
error("repair and --force is not yet supported");
ret = 1;
err |= !!ret;
goto err_out;
}
if (ret < 0) {
warning(
"cannot check mount status of %s, the filesystem could be mounted, continuing because of --force",

5
tests/cli-tests/007-check-force/test.sh
View File

@ -21,12 +21,9 @@ run_check_mount_test_dev
run_mustfail "checking mounted filesystem without --force" \
$SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV"
run_mustfail "checking mounted filesystem with --force --repair" \
$SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV"
run_check_umount_test_dev
run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV"
run_mustfail "--force --repair on unmounted filesystem" \
$SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV"
cleanup_loopdevs

2
tests/fsck-tests/013-extent-tree-rebuild/test.sh
View File

@ -35,7 +35,7 @@ test_extent_tree_rebuild()
$SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" >& /dev/null && \
_fail "btrfs check should detect failure"
run_check $SUDO_HELPER "$TOP/btrfs" check --repair --init-extent-tree "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" check --repair --force --init-extent-tree "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
}

2
tests/fsck-tests/032-corrupted-qgroup/test.sh
View File

@ -13,7 +13,7 @@ check_image() {
"$TOP/btrfs" check "$1"
# Above command can fail due to other bugs, so add extra check to
# ensure we can fix qgroup without problems.
run_check "$TOP/btrfs" check --repair "$1"
run_check "$TOP/btrfs" check --repair --force "$1"
}
check_all_images

6
tests/fuzz-tests/003-multi-check-unmounted/test.sh
View File

@ -15,10 +15,10 @@ check_image() {
image=$1
run_mayfail $TOP/btrfs check -s 1 "$image"
run_mayfail $TOP/btrfs check --init-csum-tree "$image"
run_mayfail $TOP/btrfs check --init-extent-tree "$image"
run_mayfail $TOP/btrfs check --check-data-csum "$image"
run_mayfail $TOP/btrfs check --repair --force --init-extent-tree "$image"
run_mayfail $TOP/btrfs check --repair --force --check-data-csum "$image"
run_mayfail $TOP/btrfs check --subvol-extents "$image"
run_mayfail $TOP/btrfs check --repair "$image"
run_mayfail $TOP/btrfs check --repair --force "$image"
}
check_all_images "$TEST_TOP/fuzz-tests/images"