Skip to content
This repository has been archived by the owner on Mar 11, 2020. It is now read-only.

17.06.1 chp #4

Merged
merged 3 commits into from
Jul 7, 2017
Merged

17.06.1 chp #4

merged 3 commits into from
Jul 7, 2017

Conversation

mlaventure
Copy link

@mlaventure mlaventure commented Jul 4, 2017

Cherry-picked fixes since 17.06.0 freeze:

runcom and others added 3 commits July 4, 2017 10:34
This patch handles case c) in moby/moby#31487

(c) A request cannot be added to 's.tasks' because the queue is full.

case b) isn't fixable at this point case there's no way to cancel stuff
from a channel since channels aren't context aware (yet?).
Parallelizing tasks handling isn't easily doable either.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit b812857)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This PR containerd#930 ignored
SIGPIPE signals but we aren't actually subscribed to receive them (and
ignore them).
This patch adds the missing piece by subscribing to receive SIGPIPE(s).

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 6a7b7d2)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
kill shim will send SIGKILL to its children, but
if the container is paused, the container doesn't
response to the signal, this cause the containerd
block and fail to start next time.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit b2a80cf)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
@andrewhsu
Copy link

LGTM

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants