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

core: Add verbose messages for pruning 

When prune fails, it can be really difficult to figure out why. This at
least lets you know which objects are being considered.

https://bugzilla.gnome.org/show_bug.cgi?id=764006

Closes: #224
Approved by: cgwalters
This commit is contained in:
Dan Nicholson 2016-03-17 11:39:39 -07:00 committed by Colin Walters (automation)
parent b7a04d51f8
commit 31240982e7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-repo-prune.c
View File

@ -74,6 +74,8 @@ maybe_prune_loose_object (OtPruneData *data,
if (!g_hash_table_lookup_extended (data->reachable, key, NULL, NULL)) if (!g_hash_table_lookup_extended (data->reachable, key, NULL, NULL))
{ {
g_debug ("Pruning unneeded object %s.%s", checksum,
ostree_object_type_to_string (objtype));
if (!(flags & OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE)) if (!(flags & OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE))
{ {
guint64 storage_size = 0; guint64 storage_size = 0;
@ -101,6 +103,8 @@ maybe_prune_loose_object (OtPruneData *data,
} }
else else
{ {
g_debug ("Keeping needed object %s.%s", checksum,
ostree_object_type_to_string (objtype));
if (OSTREE_OBJECT_TYPE_IS_META (objtype)) if (OSTREE_OBJECT_TYPE_IS_META (objtype))
data->n_reachable_meta++; data->n_reachable_meta++;
else else
@ -234,6 +238,7 @@ ostree_repo_prune_static_deltas (OstreeRepo *self, const char *commit,
continue; continue;
} }
g_debug ("Trying to prune static delta %s", deltaname);
deltadir = _ostree_get_relative_static_delta_path (from, to, NULL); deltadir = _ostree_get_relative_static_delta_path (from, to, NULL);
if (!glnx_shutil_rm_rf_at (self->repo_dir_fd, deltadir, if (!glnx_shutil_rm_rf_at (self->repo_dir_fd, deltadir,
@ -310,6 +315,7 @@ ostree_repo_prune (OstreeRepo *self,
error)) error))
goto out; goto out;
g_debug ("Finding objects to keep for commit %s", checksum);
if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable, if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable,
cancellable, &local_error)) cancellable, &local_error))
{ {
@ -352,6 +358,7 @@ ostree_repo_prune (OstreeRepo *self,
error)) error))
goto out; goto out;
g_debug ("Finding objects to keep for commit %s", checksum);
if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable, if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable,
cancellable, &local_error)) cancellable, &local_error))
{ {