8000 [release/1.2] backport: Fix delete error code on the containerd daemon side. by estesp · Pull Request #3739 · containerd/containerd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[release/1.2] backport: Fix delete error code on the containerd daemon side. #3739

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
Merged
merged 1 commit into from
Oct 9, 2019
Merged

[release/1.2] backport: Fix delete error code on the containerd daemon side. #3739

merged 1 commit into from
Oct 9, 2019

Conversation

estesp
Copy link
Member
@estesp estesp commented Oct 9, 2019

Slight backport of the cherry-pick due to small code differences in runtime/v2/shim.go

Signed-off-by: Lantao Liu lantaol@google.com
Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com

@Random-Liu @estesp
Fix delete error code on the containerd daemon side.
847f74c 
Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
@estesp
Copy link
Member Author
estesp commented Oct 9, 2019

Cherry-pick/backport of #3736 // cc: @Random-Liu

@codecov-io
Copy link

Codecov Report

Merging #3739 into release/1.2 will decrease coverage by 3.18%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##           release/1.2   #3739      +/-   ##
==============================================
- Coverage        44.19%     41%   -3.19%     
==============================================
  Files              100      70      -30     
  Lines            10847    9537    -1310     
==============================================
- Hits              4794    3911     -883     
+ Misses            5313    5061     -252     
+ Partials           740     565     -175
Flag Coverage Δ
#linux ?
#windows 41% <ø> (ø) ⬆️
Impacted Files Coverage Δ
snapshots/native/native.go 1.78% <0%> (-41.52%) ⬇️
archive/tar.go 16.77% <0%> (-27.32%) ⬇️
metadata/snapshot.go 21.53% <0%> (-24.28%) ⬇️
oci/spec_opts.go 25.16% <0%> (-2.71%) ⬇️
content/local/writer.go 57.69% <0%> (-0.97%) ⬇️
gc/scheduler/scheduler.go 66.34% <0%> (-0.97%) ⬇️
mount/temp_unix.go
sys/reaper_linux.go
services/server/server_linux.go
sys/env.go
... and 26 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4456381...847f74c. Read the comment docs.

@crosbymichael
Copy link
Member

LGTM

1 similar comment
@Random-Liu
Copy link
Member

LGTM

@crosbymichael crosbymichael merged commit c3532a3 into containerd:release/1.2 Oct 9, 2019
@thaJeztah thaJeztah mentioned this pull request Nov 8, 2019
Merged
dmcgowan pushed a commit to thaJeztah/containerd that referenced this pull request Nov 20, 2019
@thaJeztah @dmcgowan
Prepare v1.2.11 release
1b4aebd 
* Update the runc vendor to v1.0.0-rc9 which includes an additional mitigation for
  [CVE-2019-16884](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-16884).
    - More details on the runc CVE in [opencontainers/runc#2128](opencontainers/runc#2128),
      and the additional mitigations in [opencontainers/runc#2130](opencontainers/runc#2130).
* Add local-fs.target to service file to fix corrupt image after unexpected host reboot.
  Reported in [containerd#3671](containerd#3671),
  and fixed by [containerd#3746](containerd#3746).
* Update Golang runtime to 1.12.13, which includes security fixes to the `crypto/dsa`
  package made in Go 1.12.11 ([CVE-2019-17596](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17596)),
  and fixes to the go command, `runtime`, `syscall` and `net` packages (Go 1.12.12).

* CRI fixes:
    - Fix shim delete error code to avoid unnecessary retries in the CRI plugin.
      Discovered in [containerd/cri#1309](containerd/cri#1309),
      and fixed by [containerd#3732](containerd#3732)
      and [containerd#3739](containerd#3739).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 28, 2019
@thaJeztah
[19.03] Update containerd binary to v1.2.11
cfcf25b 
full diff: containerd/containerd@v1.2.10...v1.2.11

The eleventh patch release for containerd 1.2 includes an updated runc with
an additional fix for CVE-2019-16884 and a Golang update.

Notable Updates
-----------------------

- Update the runc vendor to v1.0.0-rc9 which includes an additional mitigation
  for CVE-2019-16884.
  More details on the runc CVE in opencontainers/runc#2128, and the additional
  mitigations in opencontainers/runc#2130.
- Add local-fs.target to service file to fix corrupt image after unexpected host
  reboot. Reported in containerd/containerd#3671, and fixed by containerd/containerd#3746.
- Update Golang runtime to 1.12.13, which includes security fixes to the crypto/dsa
  package made in Go 1.12.11 (CVE-2019-17596), and fixes to the go command, runtime,
  syscall and net packages (Go 1.12.12).

CRI fixes:
-----------------------

- Fix shim delete error code to avoid unnecessary retries in the CRI plugin. Discovered
  in containerd/cri#1309, and fixed by containerd/containerd#3732 and containerd/containerd#3739.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Nov 28, 2019
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 16, 2020
@thaJeztah
[19.03] Update containerd binary to v1.2.11
67f4391 
full diff: containerd/containerd@v1.2.10...v1.2.11

The eleventh patch release for containerd 1.2 includes an updated runc with
an additional fix for CVE-2019-16884 and a Golang update.

Notable Updates
-----------------------

- Update the runc vendor to v1.0.0-rc9 which includes an additional mitigation
  for CVE-2019-16884.
  More details on the runc CVE in opencontainers/runc#2128, and the additional
  mitigations in opencontainers/runc#2130.
- Add local-fs.target to service file to fix corrupt image after unexpected host
  reboot. Reported in containerd/containerd#3671, and fixed by containerd/containerd#3746.
- Update Golang runtime to 1.12.13, which includes security fixes to the crypto/dsa
  package made in Go 1.12.11 (CVE-2019-17596), and fixes to the go command, runtime,
  syscall and net packages (Go 1.12.12).

CRI fixes:
-----------------------

- Fix shim delete error code to avoid unnecessary retries in the CRI plugin. Discovered
  in containerd/cri#1309, and fixed by containerd/containerd#3732 and containerd/containerd#3739.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cfcf25bb5409eb0c3a9c257b225f2b8890142030
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@estesp @codecov-io @crosbymichael @Random-Liu
0