New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle paused container when restoring without live-restore set #31704

Merged
merged 1 commit into from Mar 9, 2017

Conversation

Projects
None yet
5 participants
@mlaventure
Contributor

mlaventure commented Mar 9, 2017

Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com

--

Fixes #31699

@crosbymichael

This comment has been minimized.

Show comment
Hide comment
@crosbymichael

crosbymichael Mar 9, 2017

Contributor

Shouldn't we send the signal first then unpause?

Contributor

crosbymichael commented Mar 9, 2017

Shouldn't we send the signal first then unpause?

Handle paused container when restoring without live-restore set
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
@cpuguy83

LGTM

@mlaventure

This comment has been minimized.

Show comment
Hide comment
@mlaventure

mlaventure Mar 9, 2017

Contributor

@crosbymichael SIGTERM is sent before the call to Resume()

Contributor

mlaventure commented Mar 9, 2017

@crosbymichael SIGTERM is sent before the call to Resume()

@cpuguy83

cpuguy83 requested changes Mar 9, 2017 edited

Somehow this is effecting restart policy on restore, in that containers with restart=always are not restarting when the resume is required.

nevermind, that doesn't make sense, it was paused ;)

@crosbymichael

This comment has been minimized.

Show comment
Hide comment
@crosbymichael

crosbymichael Mar 9, 2017

Contributor

LGTM

Contributor

crosbymichael commented Mar 9, 2017

LGTM

@crosbymichael crosbymichael merged commit abb0fec into moby:master Mar 9, 2017

4 of 6 checks passed

powerpc Jenkins build is being scheduled
Details
z Jenkins build is being scheduled
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 31515 has succeeded
Details
janky Jenkins build Docker-PRs 40134 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11210 has succeeded
Details

@GordonTheTurtle GordonTheTurtle added this to the 17.04.0 milestone Mar 9, 2017

@mlaventure mlaventure deleted the mlaventure:handle-paused-container-on-non-live-restore branch Mar 10, 2017

liusdu pushed a commit to liusdu/moby that referenced this pull request Oct 30, 2017

Handle paused container when restoring without live-restore set
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

bump to v1.11.2.19
- 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

Merge branch 'bump_v1.11.2.19' into 'huawei-1.11.2'
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment