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

[18.09 backport] Vendor Libnetwork c902989#192

Merged
andrewhsu merged 1 commit intodocker-archive:18.09from
mavenugo:18.09_ln_vndr
Apr 8, 2019
Merged

[18.09 backport] Vendor Libnetwork c902989#192
andrewhsu merged 1 commit intodocker-archive:18.09from
mavenugo:18.09_ln_vndr

Conversation

@mavenugo
Copy link
Copy Markdown

@mavenugo mavenugo commented Apr 7, 2019

This commit brings in moby/libnetwork#2356 and moby/libnetwork#2357. Adds a workaround for a WS2016 HNS race issue by serializing the L2 Table programming across networks.

Signed-off-by: Madhu Venugopal madhu@docker.com

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
@mavenugo mavenugo requested a review from thaJeztah April 7, 2019 16:54
@thaJeztah thaJeztah changed the title Vendor Libnetwork c902989 [18.09 backport] Vendor Libnetwork c902989 Apr 7, 2019
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

@thaJeztah thaJeztah added this to the 18.09.5 milestone Apr 7, 2019
@selansen
Copy link
Copy Markdown

selansen commented Apr 7, 2019

Below is failed error case, I dont think its related but mentioning it here
FAIL: docker_cli_run_test.go:1791: DockerSuite.TestRunInteractiveWithRestartPolicy

17:53:32 assertion failed: 
17:53:32 Command:  /usr/local/cli/docker run -i --name test-inter-restart --restart=always busybox sh
17:53:32 ExitCode: 0
17:53:32 Error:    <nil>
17:53:32 Stdout:   
17:53:32 Stderr:   
17:53:32 
17:53:32 Failures:
17:53:32 ExitCode was 0 expected 11
17:53:33 ```

Copy link
Copy Markdown

@selansen selansen 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
Copy link
Copy Markdown
Member

I see that one was flaky a few times in the past; https://github.com/moby/moby/search?q=TestRunInteractiveWithRestartPolicy&type=Issues

Let me restart CI

@andrewhsu andrewhsu merged commit 50ebe45 into docker-archive:18.09 Apr 8, 2019
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