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

fsck: Don't load all object names into memory 

We recently discovered `list_objects()` is inefficient with memory.
The more efficient `list_objects_set()` API isn't yet public, but
this fsck code actually just skips over non-commit objects, and
we already have an API to list just those.
This commit is contained in:
Colin Walters 2022-06-09 18:32:09 -04:00
parent a13d812368
commit 6981633f9c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,17 +282,16 @@ ostree_builtin_fsck (int argc, char **argv, OstreeCommandInvocation *invocation,
} }
if (!opt_quiet) if (!opt_quiet)
g_print ("Enumerating objects...\n"); g_print ("Enumerating commits...\n");
g_autoptr(GHashTable) objects = NULL; // Find all commit objects, including partial ones
if (!ostree_repo_list_objects (repo, OSTREE_REPO_LIST_OBJECTS_ALL, g_autoptr(GHashTable) all_commits = NULL;
&objects, cancellable, error)) if (!ostree_repo_list_commit_objects_starting_with (repo, "", &all_commits, cancellable, error))
return FALSE; return FALSE;
// And gather a set of non-partial commits for further analysis
g_autoptr(GHashTable) commits = g_hash_table_new_full (ostree_hash_object_name, g_variant_equal, g_autoptr(GHashTable) commits = g_hash_table_new_full (ostree_hash_object_name, g_variant_equal,
(GDestroyNotify)g_variant_unref, NULL); (GDestroyNotify)g_variant_unref, NULL);
g_autoptr(GPtrArray) tombstones = NULL; g_autoptr(GPtrArray) tombstones = NULL;
if (opt_add_tombstones) if (opt_add_tombstones)
tombstones = g_ptr_array_new_with_free_func (g_free); tombstones = g_ptr_array_new_with_free_func (g_free);
@ -302,8 +301,8 @@ ostree_builtin_fsck (int argc, char **argv, OstreeCommandInvocation *invocation,
guint n_partial = 0; guint n_partial = 0;
guint n_fsck_partial = 0; guint n_fsck_partial = 0;
g_hash_table_iter_init (&hash_iter, objects); g_hash_table_iter_init (&hash_iter, all_commits);
while (g_hash_table_iter_next (&hash_iter, &key, &value)) while (g_hash_table_iter_next (&hash_iter, &key, NULL))
{ {
GVariant *serialized_key = key; GVariant *serialized_key = key;
const char *checksum; const char *checksum;
@ -313,7 +312,9 @@ ostree_builtin_fsck (int argc, char **argv, OstreeCommandInvocation *invocation,
ostree_object_name_deserialize (serialized_key, &checksum, &objtype); ostree_object_name_deserialize (serialized_key, &checksum, &objtype);
if (objtype == OSTREE_OBJECT_TYPE_COMMIT) g_assert (objtype == OSTREE_OBJECT_TYPE_COMMIT);
if (TRUE) // Temporarily avoiding the noise of de-indenting this whole thing
{ {
if (!ostree_repo_load_commit (repo, checksum, &commit, &commitstate, error)) if (!ostree_repo_load_commit (repo, checksum, &commit, &commitstate, error))
return FALSE; return FALSE;
@ -420,7 +421,7 @@ ostree_builtin_fsck (int argc, char **argv, OstreeCommandInvocation *invocation,
} }
} }
g_clear_pointer (&objects, g_hash_table_unref); g_clear_pointer (&all_commits, g_hash_table_unref);
if (!opt_quiet) if (!opt_quiet)
g_print ("Verifying content integrity of %u commit objects...\n", g_print ("Verifying content integrity of %u commit objects...\n",