Skip to content

Fix unnecessary consecutiveAdd for windows #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 26, 2020
Merged

Fix unnecessary consecutiveAdd for windows #509

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cac106
Fix unnecessary consecutiveAdd for windows(#367).
csfmomo Feb 21, 2020
af15864
Fix unnecessary consecutiveAdd for windows(#367).
csfmomo Feb 21, 2020
51b402a
Merge branch 'fixAddForWindows' of github.com:Azure/azure-container-n…
csfmomo Feb 24, 2020
16210f3
Fix unnecessary consecutiveAdd for windows(#367).
csfmomo Feb 21, 2020
2f60266
Fix unnecessary consecutiveAdd for windows(#367).
csfmomo Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions cni/network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,16 @@ func handleConsecutiveAdd(args *cniSkel.CmdArgs, endpointId string, nwInfo *netw
hnsEndpoint, err := hcsshim.GetHNSEndpointByName(endpointId)
if hnsEndpoint != nil {
log.Printf("[net] Found existing endpoint through hcsshim: %+v", hnsEndpoint)
log.Printf("[net] Attaching ep %v to container %v", hnsEndpoint.Id, args.ContainerID)

err := hcsshim.HotAttachEndpoint(args.ContainerID, hnsEndpoint.Id)
if err != nil {
log.Printf("[cni-net] Failed to hot attach shared endpoint[%v] to container [%v], err:%v.", hnsEndpoint.Id, args.ContainerID, err)
return nil, err
endpoint, _ := hcsshim.GetHNSEndpointByID(hnsEndpoint.Id)
isAttached, _ := endpoint.IsAttached(args.ContainerID)
// Attach endpoint if it's not attached yet.
if !isAttached {
log.Printf("[net] Attaching ep %v to container %v", hnsEndpoint.Id, args.ContainerID)
err := hcsshim.HotAttachEndpoint(args.ContainerID, hnsEndpoint.Id)
if err != nil {
log.Printf("[cni-net] Failed to hot attach shared endpoint[%v] to container [%v], err:%v.", hnsEndpoint.Id, args.ContainerID, err)
return nil, err
}
}

// Populate result.
Expand Down