From: Dan Nicholson <nicholson@endlessm.com>
Date: Thu, 17 Mar 2016 18:39:39 +0000 (-0700)
Subject: core: Add verbose messages for pruning
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~456^2^2~63
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31240982e7aec400a39ee1e71ca80d1ca67b0d4a;p=ostree.git

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
---

diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c
index eca2cff6..9aed0ac3 100644
--- a/src/libostree/ostree-repo-prune.c
+++ b/src/libostree/ostree-repo-prune.c
@@ -74,6 +74,8 @@ maybe_prune_loose_object (OtPruneData        *data,
 
   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))
         {
           guint64 storage_size = 0;
@@ -101,6 +103,8 @@ maybe_prune_loose_object (OtPruneData        *data,
     }
   else
     {
+      g_debug ("Keeping needed object %s.%s", checksum,
+               ostree_object_type_to_string (objtype));
       if (OSTREE_OBJECT_TYPE_IS_META (objtype))
         data->n_reachable_meta++;
       else
@@ -234,6 +238,7 @@ ostree_repo_prune_static_deltas (OstreeRepo *self, const char *commit,
             continue;
         }
 
+      g_debug ("Trying to prune static delta %s", deltaname);
       deltadir = _ostree_get_relative_static_delta_path (from, to, NULL);
 
       if (!glnx_shutil_rm_rf_at (self->repo_dir_fd, deltadir,
@@ -310,6 +315,7 @@ ostree_repo_prune (OstreeRepo        *self,
                                         error))
             goto out;
 
+          g_debug ("Finding objects to keep for commit %s", checksum);
           if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable,
                                                   cancellable, &local_error))
             {
@@ -352,6 +358,7 @@ ostree_repo_prune (OstreeRepo        *self,
                                         error))
             goto out;
 
+          g_debug ("Finding objects to keep for commit %s", checksum);
           if (!ostree_repo_traverse_commit_union (self, checksum, depth, data.reachable,
                                                   cancellable, &local_error))
             {