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

Comments

17.03 ee 6 chp#7

Merged
andrewhsu merged 5 commits intodocker-archive:docker-1.13.xfrom
mlaventure:17.03-ee-6-chp
Aug 8, 2017
Merged

17.03 ee 6 chp#7
andrewhsu merged 5 commits intodocker-archive:docker-1.13.xfrom
mlaventure:17.03-ee-6-chp

Conversation

@mlaventure
Copy link

@mlaventure mlaventure commented Aug 7, 2017

This port over the issue listed here (originally for 17.06) to the 17.03 branch,

The 3 issues below were NOT included though (harder to make a proper merge, and they're adding features, not fixing things):

lichao-mobanche and others added 5 commits August 7, 2017 14:25
fix the epoll fd leak
(cherry picked from commit 2b08c55)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 2c1d2e2)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
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>
ooms: make(chan string, 1024),
}
fd, err := archutils.EpollCreate1(0)
fd, err := archutils.EpollCreate1(syscall.EPOLL_CLOEXEC)
Copy link

Choose a reason for hiding this comment

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

the value 0x80000 is the change expected ?

Choose a reason for hiding this comment

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

apparently related to containerd#855

@vieux
Copy link

vieux commented Aug 8, 2017

SGTM

Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit a7f9a19 into docker-archive:docker-1.13.x Aug 8, 2017
@mlaventure mlaventure deleted the 17.03-ee-6-chp branch August 11, 2017 17:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants