Skip to content

Commit

Permalink
pull: Also append bytes written
Browse files Browse the repository at this point in the history
This is very useful information that we get from the transaction
stats.  Append it to the final display if we're not inheriting
the transaction.
  • Loading branch information
cgwalters committed Jul 17, 2020
1 parent 848411c commit 5b75358
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/libostree/ostree-repo-pull.c
Original file line number Diff line number Diff line change
Expand Up @@ -3358,6 +3358,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
* value, otherwise NULL. Used for logging.
*/
const char *the_ref_to_fetch = NULL;
OstreeRepoTransactionStats tstats = { 0, };

/* Default */
pull_data->max_metadata_size = OSTREE_MAX_METADATA_SIZE;
Expand Down Expand Up @@ -4444,7 +4445,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
}

if (!inherit_transaction &&
!ostree_repo_commit_transaction (pull_data->repo, NULL, cancellable, error))
!ostree_repo_commit_transaction (pull_data->repo, &tstats, cancellable, error))
goto out;

end_time = g_get_monotonic_time ();
Expand Down Expand Up @@ -4486,6 +4487,11 @@ ostree_repo_pull_with_options (OstreeRepo *self,
shift == 1 ? "B" : "KiB",
(guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC));
}
if (!inherit_transaction)
{
g_autofree char *bytes_written = g_format_size (tstats.content_bytes_written);
g_string_append_printf (buf, "; %s content written", bytes_written);
}

ostree_async_progress_set_status (pull_data->progress, buf->str);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/pull-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fi
# Try both syntaxes
repo_init --no-sign-verify
${CMD_PREFIX} ostree --repo=repo pull origin main >out.txt
assert_file_has_content out.txt "[1-9][0-9]* metadata, [1-9][0-9]* content objects fetched"
assert_file_has_content out.txt "[1-9][0-9]* metadata, [1-9][0-9]* content objects fetched; [1-9][0-9]*.*written"
${CMD_PREFIX} ostree --repo=repo pull origin:main > out.txt
assert_not_file_has_content out.txt "[1-9][0-9]* content objects fetched"
${CMD_PREFIX} ostree --repo=repo fsck
Expand Down

0 comments on commit 5b75358

Please sign in to comment.