Skip to content

[release/1.3] cherry-pick: Handle large output in v2 shim with TTY#3754

Merged
crosbymichael merged 1 commit intocontainerd:release/1.3from
estesp:cp-1.3-3743
Oct 14, 2019
Merged

[release/1.3] cherry-pick: Handle large output in v2 shim with TTY#3754
crosbymichael merged 1 commit intocontainerd:release/1.3from
estesp:cp-1.3-3743

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Oct 14, 2019

Resized the I/O buffers to align with the size of the kernel buffers with fifos
and move the close aspect of the console to key off of the stdin closing.

Cherry-picked #3743 for release/1.3

Signed-off-by: Michael Crosby crosbymichael@gmail.com
Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com

Reized the I/O buffers to align with the size of the kernel buffers with fifos
and move the close aspect of the console to key off of the stdin closing.

Fixes containerd#3738

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Oct 14, 2019

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member

One failure; not sure if that's a flaky?

--- FAIL: TestBtrfs (0.00s)
1529    --- FAIL: TestBtrfs/RemoveDirectoryInLowerLayer (0.21s)
1530        testsuite.go:96: Failed to initialize snapshotter: skip plugin

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@estesp
Copy link
Copy Markdown
Member Author

estesp commented Oct 14, 2019

@thaJeztah yeah, there have been some issues with the btrfs snapshotter tests. Even with #3676 attempted fix, we are still getting random failures now and then

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

👍 green now yes

LGTM

@crosbymichael crosbymichael merged commit aa98dc6 into containerd:release/1.3 Oct 14, 2019
dmcgowan pushed a commit to thaJeztah/containerd that referenced this pull request Nov 19, 2019
* 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#3745](containerd#3745).
* Fix large output of processes with TTY getting occasionally truncated. Reported in [containerd#3738](containerd#3738) and fixed by [containerd#3754](containerd#3754).
* Fix direct unpack when running in user namespace. Reported in [containerd#3762](containerd#3762), and fixed by [containerd#3779](containerd#3779).
* 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).
* Add Windows process shim installer [containerd#3792](containerd#3792)

* 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#3733](containerd#3733) and [containerd#3740](containerd#3740).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants