Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ck/cherrypick 15669 #15788

Merged
merged 6 commits into from
Jul 7, 2022
Merged

Ck/cherrypick 15669 #15788

merged 6 commits into from
Jul 7, 2022

Commits on Jul 1, 2022

  1. Chunker: Always seek on the uncompressed stream. 

    The `WriteRequest.write_offset` field has bizarre semantics during compressed uploads as documented in the remote API protos: https://github.com/bazelbuild/remote-apis/blob/3b4b6402103539d66fcdd1a4d945f660742665ca/build/bazel/remote/execution/v2/remote_execution.proto#L241-L248 In particular, the write offset of the first `WriteRequest` refers to the offset in the uncompressed source.

This change ensures we always seek the uncompressed stream to the correct offset when starting an upload call. The old code could fail to resume compressed uploads under some conditions. The `progressiveCompressedUploadShouldWork` test purported to exercise this situation. The test, however, contained the same logic error as the code under test.

Closes #15669.

PiperOrigin-RevId: 455083727
Change-Id: Ie22dacf31f15644c7a83f49776e7a633d8bb4bca
    @benjaminp @ckolli5
    benjaminp authored and ckolli5 committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    84fd41c View commit details
    Browse the repository at this point in the history

  2. Updated chunker.java file.

    @ckolli5
    ckolli5 committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    6e544b4 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Merge branch 'release-5.3.0' into ck/cherrypick-15669

    @ckolli5
    ckolli5 authored Jul 6, 2022
    Configuration menu
    Copy the full SHA
    ac351dd View commit details
    Browse the repository at this point in the history

  2. Update src/test/java/com/google/devtools/build/lib/remote/ByteStreamU… 

    …ploaderTest.java

Co-authored-by: Benjamin Peterson <benjamin@locrian.net>
    @ckolli5 @benjaminp
    ckolli5 and benjaminp authored Jul 6, 2022
    Configuration menu
    Copy the full SHA
    926fcc2 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Update src/test/java/com/google/devtools/build/lib/remote/ByteStreamU… 

    …ploaderTest.java

Co-authored-by: Benjamin Peterson <benjamin@locrian.net>
    @ckolli5 @benjaminp
    ckolli5 and benjaminp authored Jul 7, 2022
    Configuration menu
    Copy the full SHA
    950d403 View commit details
    Browse the repository at this point in the history

  2. Update src/test/java/com/google/devtools/build/lib/remote/ByteStreamU… 

    …ploaderTest.java

Co-authored-by: Benjamin Peterson <benjamin@locrian.net>
    @ckolli5 @benjaminp
    ckolli5 and benjaminp authored Jul 7, 2022
    Configuration menu
    Copy the full SHA
    36a65fe View commit details
    Browse the repository at this point in the history