Skip to content

Adding synchronization around peerAdd and peerDelete to prevent network connectivity issue #2356

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
mavenugo merged 1 commit into from
Apr 6, 2019
Merged

Adding synchronization around peerAdd and peerDelete to prevent network connectivity issue #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 24 additions & 7 deletions drivers/windows/overlay/ov_endpoint_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net"
"sync"

"github.com/Microsoft/hcsshim"
"github.com/docker/docker/pkg/system"
Expand All @@ -29,6 +30,13 @@ type endpoint struct {
portMapping []types.PortBinding // Operation port bindings
}

var (
//Server 2016 (RS1) does not support concurrent add/delete of endpoints. Therefore, we need
//to use this mutex and serialize the add/delete of endpoints on RS1.
endpointMu sync.Mutex
windowsBuild = system.GetOSVersion().Build
)

func validateID(nid, eid string) error {
if nid == "" {
return fmt.Errorf("invalid network id")
Expand Down Expand Up @@ -77,8 +85,7 @@ func (n *network) removeEndpointWithAddress(addr *net.IPNet) {

if networkEndpoint != nil {
logrus.Debugf("Removing stale endpoint from HNS")
_, err := hcsshim.HNSEndpointRequest("DELETE", networkEndpoint.profileID, "")

_, err := endpointRequest("DELETE", networkEndpoint.profileID, "")
if err != nil {
logrus.Debugf("Failed to delete stale overlay endpoint (%.7s) from hns", networkEndpoint.id)
}
Expand All @@ -101,8 +108,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
if ep != nil {
logrus.Debugf("Deleting stale endpoint %s", eid)
n.deleteEndpoint(eid)

_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
_, err := endpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand Down Expand Up @@ -179,7 +185,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
return err
}

hnsresponse, err := hcsshim.HNSEndpointRequest("POST", "", string(configurationb))
hnsresponse, err := endpointRequest("POST", "", string(configurationb))
if err != nil {
return err
}
Expand All @@ -199,7 +205,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

ep.portMapping, err = windows.ParsePortBindingPolicies(hnsresponse.Policies)
if err != nil {
hcsshim.HNSEndpointRequest("DELETE", hnsresponse.Id, "")
endpointRequest("DELETE", hnsresponse.Id, "")
return err
}

Expand All @@ -225,7 +231,7 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {

n.deleteEndpoint(eid)

_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
_, err := endpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand Down Expand Up @@ -263,3 +269,14 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro

return data, nil
}

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

@mavenugo mavenugo Apr 5, 2019

Choose a reason for hiding this comment

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

@pradipd is this a fixed version for WS 2016 server or will this change for every patch ?

Copy link
Copy Markdown
Contributor Author

@pradipd pradipd Apr 5, 2019

Choose a reason for hiding this comment

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

fixed version. We (windows) should really have a constant for this.

Copy link
Copy Markdown
Contributor

@mavenugo mavenugo Apr 6, 2019

Choose a reason for hiding this comment

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

Thanks. We see it as a hcsshim constant osversion.RS5. Thanks.

endpointMu.Lock()
}
hnsresponse, err := hcsshim.HNSEndpointRequest(method, path, request)
if windowsBuild == 14393 {
endpointMu.Unlock()
}
return hnsresponse, err
}
5 changes: 2 additions & 3 deletions drivers/windows/overlay/peerdb_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
}

n.removeEndpointWithAddress(addr)
Comment thread
pradipd marked this conversation as resolved.

hnsresponse, err := hcsshim.HNSEndpointRequest("POST", "", string(configurationb))
hnsresponse, err := endpointRequest("POST", "", string(configurationb))
if err != nil {
return err
}
Expand Down Expand Up @@ -108,7 +107,7 @@ func (d *driver) peerDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPMas
}

if updateDb {
_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
_, err := endpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand Down