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: Include the commits that contain the corruption in errors

Browse Source 
This makes it easier to figure out what the corruption affects.

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

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

@ -63,16 +63,31 @@ fsck_one_object (OstreeRepo *repo,
if (!ostree_repo_fsck_object (repo, objtype, checksum, cancellable, &temp_error)) if (!ostree_repo_fsck_object (repo, objtype, checksum, cancellable, &temp_error))
{ {
gboolean object_missing = FALSE; gboolean object_missing = FALSE;
g_auto(GStrv) parent_commits = NULL;
g_autofree char *parent_commits_str = NULL;
if (object_parents)
{
parent_commits = ostree_repo_traverse_parents_get_commits (object_parents, key);
parent_commits_str = g_strjoinv (", ", parent_commits);
}
if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{ {
g_clear_error (&temp_error); g_clear_error (&temp_error);
g_printerr ("Object missing: %s.%s\n", checksum, if (parent_commits_str)
ostree_object_type_to_string (objtype)); g_printerr ("Object missing in commits %s: %s.%s\n", parent_commits_str, checksum,
ostree_object_type_to_string (objtype));
else
g_printerr ("Object missing: %s.%s\n", checksum,
ostree_object_type_to_string (objtype));
object_missing = TRUE; object_missing = TRUE;
} }
else else
{ {
if (parent_commits_str)
g_prefix_error (&temp_error, "In commits %s: ", parent_commits_str);
if (opt_delete) if (opt_delete)
{ {
g_printerr ("%s\n", temp_error->message); g_printerr ("%s\n", temp_error->message);
@ -90,9 +105,8 @@ fsck_one_object (OstreeRepo *repo,
{ {
*out_found_corruption = TRUE; *out_found_corruption = TRUE;
if (object_parents != NULL && objtype != OSTREE_OBJECT_TYPE_COMMIT) if (parent_commits != NULL && objtype != OSTREE_OBJECT_TYPE_COMMIT)
{ {
g_auto(GStrv) parent_commits = ostree_repo_traverse_parents_get_commits (object_parents, key);
int i; int i;
/* The commit was missing or deleted, mark the commit partial */ /* The commit was missing or deleted, mark the commit partial */

2
tests/test-corruption.sh
View File

@ -104,7 +104,7 @@ assert_not_has_file repo/state/${rev}.commitpartial
if $OSTREE fsck -q 2>err.txt; then if $OSTREE fsck -q 2>err.txt; then
assert_not_reached "fsck unexpectedly succeeded" assert_not_reached "fsck unexpectedly succeeded"
fi fi
assert_file_has_content_literal err.txt "Object missing:" assert_file_has_content_literal err.txt "Object missing"
assert_file_has_content_literal err.txt "Marking commit as partial: $rev" assert_file_has_content_literal err.txt "Marking commit as partial: $rev"
assert_has_file repo/state/${rev}.commitpartial assert_has_file repo/state/${rev}.commitpartial