Skip to content

Remove hot attach for create endpoint. Join will hot attach instead #243

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

Closed
wants to merge 5 commits into from
Closed

Remove hot attach for create endpoint. Join will hot attach instead #243

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f758353
Remove hot attach for create endpoint. Join will hot attach instead
plooploops Sep 8, 2018
e61e92a
Update for CNI vs. CNM. CNM attach as separate step.
plooploops Sep 13, 2018
1b55553
Merge remote-tracking branch 'upstream/master'
plooploops Nov 20, 2018
26f5057
Merge remote-tracking branch 'upstream/master'
plooploops Nov 21, 2018
dcddc5d
Merge remote-tracking branch 'upstream/master'
plooploops Dec 7, 2018
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
17 changes: 11 additions & 6 deletions network/endpoint_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,17 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
}
}()

// Attach the endpoint.
log.Printf("[net] Attaching endpoint %v to container %v.", hnsResponse.Id, epInfo.ContainerID)
err = hcsshim.HotAttachEndpoint(epInfo.ContainerID, hnsResponse.Id)
if err != nil {
log.Printf("[net] Failed to attach endpoint: %v.", err)
return nil, err
// Attach the endpoint happens on join
if len(epInfo.ContainerID) > 0 {
log.Printf("[net] Attaching endpoint %v to container %v.", hnsResponse.Id, epInfo.ContainerID)
err = hcsshim.HotAttachEndpoint(epInfo.ContainerID, hnsResponse.Id)
if err != nil {
log.Printf("[net] Failed to attach endpoint: %v.", err)
return nil, err
}
} else {
// Attach the endpoint happens on join
log.Printf("[net] Skipping Attaching endpoint %v to container %v, as this will happen in NetworkDriver/Join", hnsResponse.Id, epInfo.ContainerID)
}

// Create the endpoint object.
Expand Down