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

[18.06] backport "don't invoke HCS shutdown if terminate called" - #31

Merged
thaJeztah merged 1 commit into
docker-archive:18.06from
thaJeztah:18.06-backport-jjh.37562
Aug 16, 2018
Merged

thaJeztah merged 1 commit into
docker-archive:18.06from
thaJeztah:18.06-backport-jjh.37562

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

Backport of moby#37583 for 18.06

git checkout -b 18.06-backport-jjh.37562 upstream/18.06
git cherry-pick -s -S -x 5cfededc7ca552260f8eb7319184437a816e480d
git push -u origin

cherry-pick was clean; no conflicts

Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 5cfeded)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.1 milestone Aug 3, 2018
@thaJeztah

Copy link
Copy Markdown
Member Author

PowerPC https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/10731/console failing on moby#32673 (flaky test); otherwise green, but I'll restart

15:17:04 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
15:17:04 
15:17:04 [dfe200d930738] waiting for daemon to start
15:17:04 [dfe200d930738] daemon started
15:17:04 
15:17:04 [d58a4233695ed] waiting for daemon to start
15:17:04 [d58a4233695ed] daemon started
15:17:04 
15:17:04 [dae8e0c4b5d97] waiting for daemon to start
15:17:04 [dae8e0c4b5d97] daemon started
15:17:04 
15:17:04 [dfe200d930738] exiting daemon
15:17:04 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
15:17:04 [d58a4233695ed] exiting daemon
15:17:04 [dae8e0c4b5d97] exiting daemon

@thaJeztah

Copy link
Copy Markdown
Member Author

ping @johnstep @andrewhsu

@andrewhsu
andrewhsu requested a review from johnstep August 14, 2018 22:32

@andrewhsu andrewhsu left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM wrt the cherry-pick operation

@vdemeester vdemeester left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM 🐯

@thaJeztah
thaJeztah merged commit 2987164 into docker-archive:18.06 Aug 16, 2018
@thaJeztah
thaJeztah deleted the 18.06-backport-jjh.37562 branch August 16, 2018 08:14
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.

4 participants