Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Check signal is unset before using user stopsignal #52

Merged
merged 1 commit into from
Jun 13, 2017

Conversation

seemethere
Copy link
Contributor

Cherry-picked from: moby/moby#33335

This fixes an issue where if a stop signal is set, and a user sends
SIGKILL, container.ExitOnNext() is not set, thus causing the container
to restart.

Signed-off-by: Brian Goff cpuguy83@gmail.com
(cherry picked from commit 114652a)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

This fixes an issue where if a stop signal is set, and a user sends
SIGKILL, `container.ExitOnNext()` is not set, thus causing the container
to restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 114652a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@andrewhsu andrewhsu mentioned this pull request Jun 9, 2017
40 tasks
@andrewhsu
Copy link
Contributor

andrewhsu commented Jun 10, 2017

@cpuguy83 seeing this error on integration test run:

01:01:15.524 [DockerSwarmSuite] FAIL: docker_cli_swarm_test.go:2173: DockerSwarmSuite.TestSwarmClusterEventsNetwork
01:01:15.524 [DockerSwarmSuite] 
01:01:15.524 [DockerSwarmSuite] [dfd08031fc596] waiting for daemon to start
01:01:15.524 [DockerSwarmSuite] [dfd08031fc596] daemon started
01:01:15.524 [DockerSwarmSuite] 
01:01:15.524 [DockerSwarmSuite] docker_cli_swarm_test.go:2194:
01:01:15.524 [DockerSwarmSuite]     c.Assert(out, checker.Contains, "network remove "+networkID)
01:01:15.524 [DockerSwarmSuite] ... obtained string = ""
01:01:15.524 [DockerSwarmSuite] ... substring string = "network remove 5yw12bjmi245fo3otx0japxw6"

@andrewhsu
Copy link
Contributor

andrewhsu commented Jun 10, 2017

Seeing error in windows test that is known to be flakey:

01:14:13.655 FAIL: docker_api_logs_test.go:15: DockerSuite.TestLogsAPIWithStdout
01:14:13.655 
01:14:13.655 docker_api_logs_test.go:50:
01:14:13.655     c.Fatal("timeout waiting for logs to exit")
01:14:13.655 ... Error: timeout waiting for logs to exit

@cpuguy83
Copy link
Contributor

LGTM

@andrewhsu
Copy link
Contributor

LGTM

after rebuilding again, the failed tests from before are no longer failing, taking as flakey

@andrewhsu andrewhsu merged commit 97a704b into docker-archive:17.06 Jun 13, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
@seemethere seemethere deleted the cherry_pick_33335 branch August 2, 2017 21:34
andrewhsu pushed a commit that referenced this pull request Sep 19, 2017
Switch aarch64 images to arm64v8
Upstream-commit: a1debdb
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 21, 2018
…ithDefaultAddressPoolInit

[18.09] backport TestServiceWithDefaultAddressPoolInit: avoid panic
Upstream-commit: ff9340ca2cc003d0829216524c6f96b98ce62f16
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Switch aarch64 images to arm64v8
Upstream-commit: a1debdb
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Check signal is unset before using user stopsignal
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.

3 participants