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.

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

Backmerge 1.10.1 fixes to master #20407

Merged
merged 2 commits into from
Feb 17, 2016
Merged

Conversation

tiborvass
Copy link
Contributor

Ping @tonistiigi @aaronlehmann
#20164, #20156 and #20175 were the only PRs open directly against the 1.10.1 branch.

I only cherrypicked the first two, since #20175 was reopened against master at #20209.

Related to #20203

This adds verification for getting layer data out
of layerstore. These failures should only be possible
if layer metadata files have been manually changed
of if something is wrong with tar-split algorithm.

Failing early makes sure we don’t upload invalid data
to the registries where it would fail after someone
tries to pull it.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e29e580)
Also changes missing storage layer for container
RWLayer to a soft failure.

Fixes moby#20147

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2798d7a)
@tonistiigi
Copy link
Member

LGTM

@GordonTheTurtle
Copy link

Job: Docker-PRs-WoW-TP4 FAILED:

---
          56    docker-1.11.0-dev.exe.md5
  0%  
100%  
        New File              88    docker-1.11.0-dev.exe.sha256
  0%  
100%  
        New File          27.1 m    docker.exe
  0.0%
  3.6%
  7.3%
 11.0%
 14.7%
 18.3%
 22.0%
 25.7%
 29.4%
 33.1%
 36.7%
 40.4%
 44.1%
 47.8%
 51.5%
 55.1%
 58.8%
 62.5%
 66.2%
 69.8%
 73.5%
 77.2%
 80.9%
 84.6%
 88.2%
 91.9%
 95.6%
 99.3%
100%  

------------------------------------------------------------------------------

               Total    Copied   Skipped  Mismatch    FAILED    Extras
    Dirs :         1         0         1         0         0         0
   Files :         4         4         0         0         0         0
   Bytes :   54.36 m   54.36 m         0         0         0         0
   Times :   0:00:00   0:00:00                       0:00:00   0:00:00


   Speed :           1140106400 Bytes/sec.
   Speed :            65237.411 MegaBytes/min.
   Ended : Wednesday, February 17, 2016 7:31:04 PM

+ ec=0
+ set +x
INFO: Linking the built binary to /d/CI/CI-af
---

@aaronlehmann
Copy link
Contributor

LGTM

calavera added a commit that referenced this pull request Feb 17, 2016
@calavera calavera merged commit b26c21f into moby:master Feb 17, 2016
@calavera calavera deleted the backmerge-1.10.1 branch February 17, 2016 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants