Skip to content

[release/1.3 backport] Use cached state instead of runc state.#3753

Merged
crosbymichael merged 1 commit intocontainerd:release/1.3from
thaJeztah:1.3_backport_avoid_unnecessary_runc_state
Nov 28, 2019
Merged

[release/1.3 backport] Use cached state instead of runc state.#3753
crosbymichael merged 1 commit intocontainerd:release/1.3from
thaJeztah:1.3_backport_avoid_unnecessary_runc_state

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #3711

cherry-pick was clean

Signed-off-by: Lantao Liu <lantaol@google.com>
(cherry picked from commit 18be6e3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @Random-Liu ptal

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Oct 14, 2019

Build succeeded.

@thaJeztah thaJeztah changed the title [release/1.3 backport] Use cached state instead of runc state. [WIP][release/1.3 backport] Use cached state instead of runc state. Oct 14, 2019
@thaJeztah
Copy link
Copy Markdown
Member Author

Marking as "WIP" per a discussion on Slack with Michael Crosby;

we were not going to cherry pick that change just yet, we wanted more testing in master before the runc state changes are added to a release

@thaJeztah
Copy link
Copy Markdown
Member Author

One failure in CI: https://travis-ci.org/containerd/containerd/jobs/597692901

--- FAIL: TestContentClient (6.25s)
1540    --- FAIL: TestContentClient/CommitErrorState (3.59s)
1541        testsuite.go:119: Cleanup failed: not found

@Random-Liu
Copy link
Copy Markdown
Member

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3753 into release/1.3 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.3    #3753   +/-   ##
============================================
  Coverage        45.59%   45.59%           
============================================
  Files              116      116           
  Lines            11463    11463           
============================================
  Hits              5227     5227           
  Misses            5336     5336           
  Partials           900      900
Flag Coverage Δ
#linux 45.59% <ø> (ø) ⬆️

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 7aaa8fc...9abfc70. Read the comment docs.

@thaJeztah thaJeztah changed the title [WIP][release/1.3 backport] Use cached state instead of runc state. [release/1.3 backport] Use cached state instead of runc state. Oct 24, 2019
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crosbymichael are we good with this now?

@Random-Liu
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 5028701 into containerd:release/1.3 Nov 28, 2019
@thaJeztah thaJeztah deleted the 1.3_backport_avoid_unnecessary_runc_state branch November 28, 2019 08:49
jterry75 added a commit to jterry75/containerd that referenced this pull request Dec 3, 2019
containerd 1.3.2

Welcome to the v1.3.2 release of containerd!

The second patch release for `containerd` 1.3 includes a fix for a race condition
related to the reported pid on exit when called from Docker.

### Runtime

* Fix containerd pid race condition [containerd#3857](containerd#3857)
* Use cached process state to reduce exec cost [containerd#3711](containerd#3711)

### CRI

* Added `insecure_skip_verify` option in the registry tls config to allow skipping registry certificate verification [containerd#3847](containerd#3847)

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

### Contributors

* Lantao Liu
* Derek McGowan
* Michael Crosby
* Phil Estes
* Maksym Pavlenko

### Changes

* [`ff48f57fc8`](containerd@ff48f57) Merge pull request  [containerd#3866](containerd#3866) from dmcgowan/prepare-1.3.2
* [`99005c2647`](containerd@99005c2) Add release notes for v1.3.2
* [`e987ea3cac`](containerd@e987ea3) Merge pull request  [containerd#3864](containerd#3864) from Random-Liu/update-cri-release-1.3
* [`8bbd71e560`](containerd@8bbd71e) Update cri to b1bef15fbeb6c6f0569b67322acfa74ca3597755.
* [`070c27205c`](containerd@070c272) Merge pull request  [containerd#3863](containerd#3863) from Random-Liu/cherrypick-#3857-release-1.3
* [`306d6d4b55`](containerd@306d6d4) Fix container pid.
* [`5028701f1a`](containerd@5028701) Merge pull request  [containerd#3753](containerd#3753) from thaJeztah/1.3_backport_avoid_unnecessary_runc_state
* [`e3d2b608cc`](containerd@e3d2b60) Merge pull request  [containerd#3855](containerd#3855) from fuweid/cp-3853
* [`04fbb97ad0`](containerd@04fbb97) Fix cleanup error on content client test
* [`be24f39454`](containerd@be24f39) Merge pull request  [containerd#3840](containerd#3840) from ameyag/1.3_backport_log_file_win
* [`333679343b`](containerd@3336793) Add `--log-file` flag for windows service.
* [`9abfc70043`](containerd@9abfc70) Use cached state instead of `runc state`.

### Changes from containerd/cri

* [`b1bef15f`](containerd/cri@b1bef15) Merge pull request  [containerd#1346](containerd/cri#1346) from Random-Liu/cherrypick-#1345-release-1.3
* [`27edfa06`](containerd/cri@27edfa0) Add insecure_skip_verify option.
* [`e5dd8053`](containerd/cri@e5dd805) Merge pull request  [containerd#1322](containerd/cri#1322) from Random-Liu/cherrypick-#1319-release-1.3
* [`c0dee957`](containerd/cri@c0dee95) Fix containerd build, use `libbtrfs-dev` when available.
* [`1fb415d2`](containerd/cri@1fb415d) Merge pull request  [containerd#1314](containerd/cri#1314) from Random-Liu/cherrypick-#1312-release-1.3
* [`0973459d`](containerd/cri@0973459) Update based on default xenial distro.
* [`a46f6baf`](containerd/cri@a46f6ba) Configure golangci-lint

### Dependency Changes

Previous release can be found at [v1.3.1](https://github.com/containerd/containerd/releases/tag/v1.3.1)

* **github.com/containerd/cri**  5d49e7e51b43e36a6b9c4386257c7d08c602237f -> b1bef15fbeb6c6f0569b67322acfa74ca3597755

# gpg: directory '/c/Users/juterry/.gnupg' created
# gpg: keybox '/c/Users/juterry/.gnupg/pubring.kbx' created
# gpg: Signature made Tue Dec  3 11:09:10 2019 PST
# gpg:                using RSA key 8C7A111C21105794B0E8A27BF58C5D0A4405ACDB
# gpg: Can't check signature: No public key
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