Skip to content

Vendor Libnetwork 48f8463#39018

Merged
thaJeztah merged 1 commit intomoby:masterfrom
mavenugo:moby-libn-vndr
Apr 9, 2019
Merged

Vendor Libnetwork 48f8463#39018
thaJeztah merged 1 commit intomoby:masterfrom
mavenugo:moby-libn-vndr

Conversation

@mavenugo
Copy link
Copy Markdown
Contributor

@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 [email protected]

- 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 <[email protected]>
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 7, 2019

Codecov Report

Merging #39018 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #39018      +/-   ##
==========================================
- Coverage   36.89%   36.89%   -0.01%     
==========================================
  Files         613      613              
  Lines       45421    45421              
==========================================
- Hits        16760    16757       -3     
- Misses      26370    26372       +2     
- Partials     2291     2292       +1

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

Copy link
Copy Markdown
Contributor

@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

below error doesn't seem to be related libnetwork vendor update

22:17:44 
22:17:44 assertion failed: 
22:17:44 Command:  /usr/local/cli/docker run -i --name test-inter-restart --restart=always busybox sh
22:17:44 ExitCode: 0
22:17:44 Error:    <nil>
22:17:44 Stdout:   
22:17:44 Stderr:   ```

}

func endpointRequest(method, path, request string) (*hcsshim.HNSEndpoint, error) {
if windowsBuild == 14393 {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

FWIW, I think this fix should be upstreamed to hcsshim; this is not something consumers of the hcsshim package should have to deal with; I'll have a look if I can create a patch there

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes. We discussed about it. Unfortunately, this pulls in a lot of vendor code which requires more integration test cases. Given the immediate release concerns, this is a good compromise to have.

@crosbymichael
Copy link
Copy Markdown
Contributor

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants