packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: Only print "marking commit partial" once 

Let's only print if the commit isn't already partial; this
addresses a spam of "marking commit partial" from fsck.

Closes: #1548
Approved by: cgwalters
This commit is contained in:
Colin Walters 2018-04-18 18:36:19 +00:00 committed by Atomic Bot
parent 6d01d82b9b
commit 41b97e9c12
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,9 +99,16 @@ fsck_one_object (OstreeRepo *repo,
for (i = 0; parent_commits[i] != NULL; i++) for (i = 0; parent_commits[i] != NULL; i++)
{ {
const char *parent_commit = parent_commits[i]; const char *parent_commit = parent_commits[i];
g_printerr ("Marking commit %s as partial\n", parent_commit); OstreeRepoCommitState state;
if (!ostree_repo_mark_commit_partial (repo, parent_commit, TRUE, error)) if (!ostree_repo_load_commit (repo, parent_commit, NULL,
&state, error))
return FALSE; return FALSE;
if ((state & OSTREE_REPO_COMMIT_STATE_PARTIAL) == 0)
{
g_printerr ("Marking commit as partial: %s\n", parent_commit);
if (!ostree_repo_mark_commit_partial (repo, parent_commit, TRUE, error))
return FALSE;
}
} }
} }
} }

5
tests/installed/nondestructive/itest-pull.sh
View File

@ -35,11 +35,12 @@ echo "ok pull"
# fsck marks commits partial # fsck marks commits partial
# https://github.com/ostreedev/ostree/pull/1533 # https://github.com/ostreedev/ostree/pull/1533
for d in $(find bare-repo/objects/ -maxdepth 1 -type d); do for d in $(find bare-repo/objects/ -maxdepth 1 -type d); do
(find ${d} -name '*.file' || true) | head -20 | xargs rm -vf (find ${d} -name '*.file' || true) | head -20 | xargs rm -f
done done
if ostree --repo=bare-repo fsck; then if ostree --repo=bare-repo fsck |& tee fsck.txt; then
fatal "fsck unexpectedly succeeded" fatal "fsck unexpectedly succeeded"
fi fi
assert_streq $(grep -cE -e 'Marking commit as partial' fsck.txt) "1"
ostree --repo=bare-repo pull origin ${host_nonremoteref} ostree --repo=bare-repo pull origin ${host_nonremoteref}
# Don't need a full fsck here # Don't need a full fsck here
ostree --repo=bare-repo ls origin:${host_nonremoteref} >/dev/null ostree --repo=bare-repo ls origin:${host_nonremoteref} >/dev/null

4
tests/test-corruption.sh
View File

@ -105,7 +105,7 @@ 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 $rev as partial" 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
echo "ok missing file" echo "ok missing file"
@ -125,7 +125,7 @@ if $OSTREE fsck -q --delete 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 "Corrupted file object;" assert_file_has_content_literal err.txt "Corrupted file object;"
assert_file_has_content_literal err.txt "Marking commit $rev as partial" 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
echo "ok corrupt file" echo "ok corrupt file"