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

[18.03] Update libnetwork to fix stale HNS endpoints on Windows#469

Merged
andrewhsu merged 1 commit intodocker-archive:18.03from
andrewhsu:hns
Mar 15, 2018
Merged

[18.03] Update libnetwork to fix stale HNS endpoints on Windows#469
andrewhsu merged 1 commit intodocker-archive:18.03from
andrewhsu:hns

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu commented Mar 15, 2018

backport:

with cherry-pick of moby/moby@fb364f0:

$ git cherry-pick -s -x -Xsubtree=components/engine fb364f0

no conflicts.

@thaJeztah @andrewhsu
Update libnetwork to fix stale HNS endpoints on Windows
3b70997 
Update libnetwork to 1b91bc94094ecfdae41daa465cc0c8df37dfb3dd to bring in a fix
for stale HNS endpoints on Windows:

When Windows Server 2016 is restarted with the Docker service running, it is
possible for endpoints to be deleted from the libnetwork store without being
deleted from HNS. This does not occur if the Docker service is stopped cleanly
first, or forcibly terminated (since the endpoints still exist in both). This
change works around the issue by removing any stale HNS endpoints for a network
when creating it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fb364f0)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.03.0 milestone Mar 15, 2018
johnstep
johnstep approved these changes Mar 15, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@johnstep johnstep left a comment

Choose a reason for hiding this comment

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

LGTM

thaJeztah
thaJeztah approved these changes Mar 15, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@andrewhsu
Copy link
Copy Markdown
Contributor Author

andrewhsu commented Mar 15, 2018

Looks like only failing test is:

FAIL: docker_cli_run_test.go:4374: DockerSuite.TestSlowStdinClosing

docker_cli_run_test.go:4390:
    c.Fatal("running container timed out") // cleanup in teardown
... Error: running container timed out

Which seems to be addressed upstream in:

Rest of tests are green.

@andrewhsu andrewhsu merged commit 78455c2 into docker-archive:18.03 Mar 15, 2018
@andrewhsu andrewhsu deleted the hns branch March 15, 2018 07:21
docker-jenkins pushed a commit that referenced this pull request May 4, 2020
@thaJeztah
Merge pull request #469 from thaJeztah/19.03_backport_deb_noninteractive
e8a5b96 
[19.03 backport] deb: use DEBIAN_FRONTEND=noninteractive for all dockerfiles
Upstream-commit: a42945f48ce09849beb3f7525312979511cc72e6
Component: packaging
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@fcrisciani fcrisciani Awaiting requested review from fcrisciani

3 more reviewers

@tiborvass tiborvass tiborvass approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

@johnstep johnstep johnstep approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.03.0

Development

Successfully merging this pull request may close these issues.

4 participants

@andrewhsu @tiborvass @thaJeztah @johnstep