Handle paused container when restoring without live-restore set#31704
Merged
crosbymichael merged 1 commit intomoby:masterfrom Mar 9, 2017
Merged
Conversation
Contributor
|
Shouldn't we send the signal first then unpause? |
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
mlaventure
force-pushed
the
handle-paused-container-on-non-live-restore
branch
from
58f293c to
c458d3b
Compare
Contributor
Author
|
@crosbymichael |
cpuguy83
requested changes
Mar 9, 2017
cpuguy83
approved these changes
Mar 9, 2017
Contributor
|
LGTM |
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
This is cherry-picked from docker upstream PR: moby#31704 Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
- Bugfix: Increase udev wait timeout to 185s (mr 365) - Bugfix: Add restarting check before attach a container (mr 362) - Bugfix: daemon: reorder mounts before setting them (mr 350) - Feature: modify centos rpm spec according to that of EulerOS (mr 361) - Backport: fix TestDaemonRestartWithInvalidBasesize (mr 358) - Backport: Ignore "failed to close stdin" if container or process not found (mr 364) - Backport: Reset RemovalInProgress flag on daemon restart (mr 360) - Backport: backport some prs after bumping containerd to v0.2.x branch (mr 342) - Fix restoring behavior when live-restore is not set (moby#24984) - Fix a race in libcontainerd/pausemonitor_linux.go (moby#26695) - Fix libcontainerd: attach streams before create (moby#26744) - add lock in libcontainerd client AddProcess (moby#27094) - Fix issues with fifos blocking on open (moby#27405) - inherit the daemon log options when creating containers (moby#21153) - Fix panic while merging log configs to nil map (moby#24548) - Move stdio attach from libcontainerd backend to callback (moby#27467) - Fix race on sending stdin close event (moby#28682) - Handle paused container when restoring without live-restore set (moby#31704) - Fix daemon panic on restoring containers (moby#25111) Signed-off-by: Lei Jitang <leijitang@huawei.com>
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
bump to v1.11.2.19 - Bugfix: fix TestDaemonRestartWithInvalidBasesize (mr 358) - Bugfix: Increase udev wait timeout to 185s (mr 365) - Bugfix: Ignore "failed to close stdin" if container or process not found (mr 364) - Bugfix: Add restarting check before attach a container (mr 362) - Feature: modify centos rpm spec according to that of EulerOS (mr 361) - Backport: daemon: reorder mounts before setting them (mr 350) - Backport: Reset RemovalInProgress flag on daemon restart (mr 360) - Backport: backport some prs after bumping containerd to v0.2.x branch (mr 342) - Fix restoring behavior when live-restore is not set (moby#24984) - Fix a race in libcontainerd/pausemonitor_linux.go (moby#26695) - Fix libcontainerd: attach streams before create (moby#26744) - add lock in libcontainerd client AddProcess (moby#27094) - Fix issues with fifos blocking on open (moby#27405) - inherit the daemon log options when creating containers (moby#21153) - Fix panic while merging log configs to nil map (moby#24548) - Move stdio attach from libcontainerd backend to callback (moby#27467) - Fix race on sending stdin close event (moby#28682) - Handle paused container when restoring without live-restore set (moby#31704) - Fix daemon panic on restoring containers (moby#25111) Signed-off-by: Lei Jitang <leijitang@huawei.com> See merge request docker/docker!366
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com
--
Fixes #31699