keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Print rpmmd to journal in prepare()

Browse Source 
The "Preparing pkg txn" message is a bit misleading when all we're doing
is e.g. `refresh-md` or check-mode auto-updates trigger. Move that
message to `prepare()` instead.

We already do print to the journal the repos that are enabled before we
try to update them. That seems like good enough information for the
cases mentioned above.

Closes: #1289
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-03-05 18:08:38 +00:00 committed by Atomic Bot
parent 747e52cbc9
commit 03874ba49a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libpriv/rpmostree-core.c
View File

@ -1135,11 +1135,18 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
rpmostree_output_progress_end (); rpmostree_output_progress_end ();
} }
return TRUE;
}
static void
journal_rpmmd_info (RpmOstreeContext *self)
{
/* A lot of code to simply log a message to the systemd journal with the state /* A lot of code to simply log a message to the systemd journal with the state
* of the rpm-md repos. This is intended to aid system admins with determining * of the rpm-md repos. This is intended to aid system admins with determining
* system ""up-to-dateness"". * system ""up-to-dateness"".
*/ */
{ g_autoptr(GPtrArray) repos = get_enabled_rpmmd_repos (self->dnfctx, DNF_REPO_ENABLED_PACKAGES); { g_autoptr(GPtrArray) repos =
get_enabled_rpmmd_repos (self->dnfctx, DNF_REPO_ENABLED_PACKAGES);
g_autoptr(GString) enabled_repos = g_string_new (""); g_autoptr(GString) enabled_repos = g_string_new ("");
g_autoptr(GString) enabled_repos_solvables = g_string_new (""); g_autoptr(GString) enabled_repos_solvables = g_string_new ("");
g_autoptr(GString) enabled_repos_timestamps = g_string_new (""); g_autoptr(GString) enabled_repos_timestamps = g_string_new ("");
@ -1161,20 +1168,23 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
g_autofree char *quoted = g_shell_quote (dnf_repo_get_id (repo)); g_autofree char *quoted = g_shell_quote (dnf_repo_get_id (repo));
g_string_append (enabled_repos, quoted); g_string_append (enabled_repos, quoted);
total_solvables += dnf_repo_get_n_solvables (repo); total_solvables += dnf_repo_get_n_solvables (repo);
g_string_append_printf (enabled_repos_solvables, "%u", dnf_repo_get_n_solvables (repo)); g_string_append_printf (enabled_repos_solvables, "%u",
g_string_append_printf (enabled_repos_timestamps, "%" G_GUINT64_FORMAT, dnf_repo_get_timestamp_generated (repo)); dnf_repo_get_n_solvables (repo));
g_string_append_printf (enabled_repos_timestamps, "%" G_GUINT64_FORMAT,
dnf_repo_get_timestamp_generated (repo));
} }
sd_journal_send ("MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(RPMOSTREE_MESSAGE_PKG_REPOS), sd_journal_send ("MESSAGE_ID=" SD_ID128_FORMAT_STR,
"MESSAGE=Preparing pkg txn; enabled repos: [%s] solvables: %u", enabled_repos->str, total_solvables, SD_ID128_FORMAT_VAL(RPMOSTREE_MESSAGE_PKG_REPOS),
"SACK_N_SOLVABLES=%i", dnf_sack_count (dnf_context_get_sack (self->dnfctx)), "MESSAGE=Preparing pkg txn; enabled repos: [%s] solvables: %u",
enabled_repos->str, total_solvables,
"SACK_N_SOLVABLES=%i",
dnf_sack_count (dnf_context_get_sack (self->dnfctx)),
"ENABLED_REPOS=[%s]", enabled_repos->str, "ENABLED_REPOS=[%s]", enabled_repos->str,
"ENABLED_REPOS_SOLVABLES=[%s]", enabled_repos_solvables->str, "ENABLED_REPOS_SOLVABLES=[%s]", enabled_repos_solvables->str,
"ENABLED_REPOS_TIMESTAMPS=[%s]", enabled_repos_timestamps->str, "ENABLED_REPOS_TIMESTAMPS=[%s]", enabled_repos_timestamps->str,
NULL); NULL);
} }
return TRUE;
} }
/* Quote/squash all non-(alphanumeric plus `.` and `-`); this /* Quote/squash all non-(alphanumeric plus `.` and `-`); this
@ -1881,6 +1891,7 @@ rpmostree_context_prepare (RpmOstreeContext *self,
{ {
if (!rpmostree_context_download_metadata (self, cancellable, error)) if (!rpmostree_context_download_metadata (self, cancellable, error))
return FALSE; return FALSE;
journal_rpmmd_info (self);
} }
/* Don't try to keep multiple kernels per root; that's a traditional thing, /* Don't try to keep multiple kernels per root; that's a traditional thing,