shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-09 01:18:35 +03:00
Code Issues Projects Releases Wiki Activity

fsck: Add --all to print all corrupted object

Browse Source 
Stopping on the first error is nice if you just want to know if everything is ok, but
if you want to figure out all that is wrong its nice to be able to continue and
print all corruptions.

Closes: #1591
Approved by: cgwalters
This commit is contained in:
Alexander Larsson 2018-05-17 10:06:24 +02:00 committed by Atomic Bot
parent ef86abe228
commit 5f82503a01
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ostree/ot-builtin-fsck.c
View File

@ -31,6 +31,7 @@
static gboolean opt_quiet;
static gboolean opt_delete;
static gboolean opt_all;
static gboolean opt_add_tombstones;
static gboolean opt_verify_bindings;
static gboolean opt_verify_back_refs;
@ -43,6 +44,7 @@ static gboolean opt_verify_back_refs;
static GOptionEntry options[] = {
{ "add-tombstones", 0, 0, G_OPTION_ARG_NONE, &opt_add_tombstones, "Add tombstones for missing commits", NULL },
{ "quiet", 'q', 0, G_OPTION_ARG_NONE, &opt_quiet, "Only print error messages", NULL },
{ "all", 'a', 0, G_OPTION_ARG_NONE, &opt_all, "Don't stop on first error", NULL },
{ "delete", 0, 0, G_OPTION_ARG_NONE, &opt_delete, "Remove corrupted objects", NULL },
{ "verify-bindings", 0, 0, G_OPTION_ARG_NONE, &opt_verify_bindings, "Verify ref bindings", NULL },
{ "verify-back-refs", 0, 0, G_OPTION_ARG_NONE, &opt_verify_back_refs, "Verify back-references (implies --verify-bindings)", NULL },
@ -94,6 +96,11 @@ fsck_one_object (OstreeRepo *repo,
(void) ostree_repo_delete_object (repo, objtype, checksum, cancellable, NULL);
object_missing = TRUE;
}
else if (opt_all)
{
*out_found_corruption = TRUE;
g_printerr ("%s\n", temp_error->message);
}
else
{
g_propagate_error (error, g_steal_pointer (&temp_error));

25
tests/test-corruption.sh
View File

@ -21,7 +21,7 @@
set -euo pipefail
echo "1..8"
echo "1..9"
. $(dirname $0)/libtest.sh
@ -118,6 +118,7 @@ rev=$($OSTREE rev-parse test2)
filechecksum=$(ostree_file_path_to_checksum repo test2 /firstfile)
echo corrupted >> repo/$(ostree_checksum_to_relative_object_path repo $filechecksum)
unset filechecksum
assert_not_has_file repo/state/${rev}.commitpartial
@ -129,3 +130,25 @@ assert_file_has_content_literal err.txt "Marking commit as partial: $rev"
assert_has_file repo/state/${rev}.commitpartial
echo "ok corrupt file"
cd ${test_tmpdir}
rm repo files -rf
setup_test_repository "bare"
rev=$($OSTREE rev-parse test2)
firstfilechecksum=$(ostree_file_path_to_checksum repo test2 /firstfile)
echo corrupted >> repo/$(ostree_checksum_to_relative_object_path repo $firstfilechecksum)
secondfilechecksum=$(ostree_file_path_to_checksum repo test2 /baz/cow)
echo corrupted >> repo/$(ostree_checksum_to_relative_object_path repo $secondfilechecksum)
assert_not_has_file repo/state/${rev}.commitpartial
if $OSTREE fsck -a --delete 2>err.txt; then
assert_not_reached "fsck unexpectedly succeeded"
fi
assert_file_has_content err.txt "Corrupted file object.*${firstfilechecksum}"
assert_file_has_content err.txt "Corrupted file object.*${secondfilechecksum}"
assert_file_has_content_literal err.txt "Marking commit as partial: $rev"
assert_has_file repo/state/${rev}.commitpartial
echo "ok fsck --all"