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

lib: Minor static delta fixes 

First, the manual crosscheck script bitrotted; it got caught up
in the "use libtest repo creation wrapper" bit, and also it
seems like at some point `pull --require-static-deltas` changed
meaning when dealing with `file:///` repos.  I have more work to
unwind that.

Next, I'm seeing a delta failure which looks like a static delta
miscompilation with rollsums; change the compiler to print out
the source object too, which helped me debug this.

And finally in the processing code, fix incorrect error prefixing, which was
misleading.

Closes: #1311
Approved by: ashcrow
This commit is contained in:
Colin Walters 2017-10-27 16:14:02 -04:00 committed by Atomic Bot
parent 0d259ac401
commit 7f8ff5756e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manual-tests/static-delta-generate-crosscheck.sh
View File

@ -42,11 +42,11 @@ assert_streq() {
} }
validate_delta_options() { validate_delta_options() {
mkdir testrepo ostree --repo=testrepo init --mode=bare-user
ostree_repo_init testrepo --mode=bare-user
ostree --repo=testrepo remote add --set=gpg-verify=false local file://${repo} ostree --repo=testrepo remote add --set=gpg-verify=false local file://${repo}
ostree --repo=${repo} static-delta generate $@ --from=${from} --to=${to} ostree --repo=${repo} static-delta generate $@ --from=${from} --to=${to}
ostree --repo=testrepo pull --require-static-deltas local ${branch}@${from} ostree --repo=${repo} summary -u
ostree --repo=testrepo pull local ${branch}@${from}
assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${from} assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${from}
ostree --repo=testrepo pull --require-static-deltas local ${branch} ostree --repo=testrepo pull --require-static-deltas local ${branch}
assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${to} assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${to}

4
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -651,8 +651,8 @@ try_content_rollsum (OstreeRepo *repo,
if (opts & DELTAOPT_FLAG_VERBOSE) if (opts & DELTAOPT_FLAG_VERBOSE)
{ {
g_printerr ("rollsum for %s; crcs=%u bufs=%u total=%u matchsize=%llu\n", g_printerr ("rollsum for %s -> %s; crcs=%u bufs=%u total=%u matchsize=%llu\n",
to, matches->crcmatches, from, to, matches->crcmatches,
matches->bufmatches, matches->bufmatches,
matches->total, (unsigned long long)matches->match_size); matches->total, (unsigned long long)matches->match_size);
} }

4
src/libostree/ostree-repo-static-delta-processing.c
View File

@ -711,7 +711,7 @@ dispatch_write (OstreeRepo *repo,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR("opcode open-splice-and-close", error); GLNX_AUTO_PREFIX_ERROR("opcode write", error);
guint64 content_size; guint64 content_size;
guint64 content_offset; guint64 content_offset;
@ -816,7 +816,7 @@ dispatch_close (OstreeRepo *repo,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR("opcode open-splice-and-close", error); GLNX_AUTO_PREFIX_ERROR("opcode close", error);
if (state->content_out) if (state->content_out)
{ {