Merge pull request #1142 from unclejack/1.1.9-backports

backport fixes for the 1.1.9 release

drivers/ovsd/ovsSwitch.go

@@ -50,12 +50,13 @@ const (
 
 // OvsSwitch represents on OVS bridge instance
 type OvsSwitch struct {
-	bridgeName  string
-	netType     string
-	uplinkDb    cmap.ConcurrentMap
-	ovsdbDriver *OvsdbDriver
-	ofnetAgent  *ofnet.OfnetAgent
-	hostPvtNW   int
+	bridgeName    string
+	netType       string
+	uplinkDb      cmap.ConcurrentMap
+	ovsdbDriver   *OvsdbDriver
+	ofnetAgent    *ofnet.OfnetAgent
+	hostPvtNW     int
+	vxlanEncapMtu int
 }
 
 // getPvtIP returns a private IP for the port
@@ -100,6 +101,10 @@ func NewOvsSwitch(bridgeName, netType, localIP, fwdMode string,
 	sw.netType = netType
 	sw.uplinkDb = cmap.New()
 	sw.hostPvtNW = hostPvtNW
+	sw.vxlanEncapMtu, err = netutils.GetHostLowestLinkMtu()
+	if err != nil {
+		log.Fatalf("Failed to get Host Node MTU. Err: %v", err)
+	}
 
 	// Create OVS db driver
 	sw.ovsdbDriver, err = NewOvsdbDriver(bridgeName, "secure", vxlanUDPPort)
@@ -359,7 +364,12 @@ func (sw *OvsSwitch) CreatePort(intfName string, cfgEp *mastercfg.CfgEndpointSta
 
 	// Set the link mtu to 1450 to allow for 50 bytes vxlan encap
 	// (inner eth header(14) + outer IP(20) outer UDP(8) + vxlan header(8))
-	err = setLinkMtu(intfName, vxlanEndpointMtu)
+	if sw.netType == "vxlan" {
+		correctMtu := sw.vxlanEncapMtu - 50 //Include Vxlan header size
+		err = setLinkMtu(intfName, correctMtu)
+	} else {
+		err = setLinkMtu(intfName, sw.vxlanEncapMtu)
+	}
 	if err != nil {
 		log.Errorf("Error setting link %s mtu. Err: %v", intfName, err)
 		return err

mgmtfn/dockplugin/ipamDriver.go

@@ -288,6 +288,17 @@ func releaseAddress(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("Received ReleaseAddressRequest: %+v", areq)
 
+	//Build an release request to be sent to master
+	releaseReq := master.AddressReleaseRequest{
+		NetworkID:   areq.PoolID,
+		IPv4Address: areq.Address,
+	}
+	var releaseResp master.AddressReleaseResponse
+	if err = cluster.MasterPostReq("/plugin/releaseAddress",
+		&releaseReq, &releaseResp); err != nil {
+		httpError(w, "master failed to release request", err)
+		return
+	}
 	// response
 	relResp := api.ReleaseAddressResponse{}
 

mgmtfn/dockplugin/netDriver.go

@@ -189,8 +189,6 @@ func createEndpoint(hostname string) func(http.ResponseWriter, *http.Request) {
 			return
 		}
 
-		log.Infof("CreateEndpointRequest: %+v. Interface: %+v", cereq, cereq.Interface)
-
 		tenantName, netName, serviceName, err := GetDockerNetworkName(cereq.NetworkID)
 		if err != nil {
 			log.Errorf("Error getting network name for UUID: %s. Err: %v", cereq.NetworkID, err)
@@ -213,6 +211,8 @@ func createEndpoint(hostname string) func(http.ResponseWriter, *http.Request) {
 			},
 		}
 
+		log.Infof("CreateEndpointRequest: %+v. Interface: %+v", mreq, cereq.Interface)
+
 		var mresp master.CreateEndpointResponse
 		err = cluster.MasterPostReq("/plugin/createEndpoint", &mreq, &mresp)
 		if err != nil {

netmaster/master/api.go

@@ -49,6 +49,9 @@ type AddressReleaseRequest struct {
 	NetworkID   string // Unique identifier for the network
 	IPv4Address string // Allocated address
 }
+type AddressReleaseResponse struct {
+	Status string
+}
 
 // CreateEndpointRequest has the endpoint create request from netplugin
 type CreateEndpointRequest struct {

netmaster/master/network.go

@@ -512,9 +512,11 @@ func networkReleaseAddress(nwCfg *mastercfg.CfgNetworkState, epgCfg *mastercfg.E
 				nwCfg.EpAddrCount--
 			}
 			nwCfg.IPAllocMap.Clear(ipAddrValue)
+			log.Infof("Releasing IP Address: %v"+
+				"from networkId:%+v", ipAddrValue,
+				nwCfg.NetworkName)
 		}
 	}
-
 	err := nwCfg.Write()
 	if err != nil {
 		log.Errorf("error writing nw config. Error: %s", err)

netplugin/cluster/cluster.go

@@ -123,7 +123,8 @@ func masterReq(path string, req interface{}, resp interface{}, isDel bool) error
 				time.Sleep(time.Second)
 				continue
 			} else if err != nil {
-				log.Errorf("Error making %s request: Err: %v", reqType, err)
+				log.Errorf("Error making %s request: Err: %v"+
+					"with resp:%+v", reqType, err, resp)
 				return err
 			}
 

utils/httputils.go

@@ -131,7 +131,7 @@ func HTTPPost(url string, req interface{}, resp interface{}) error {
 		return err
 	}
 
-	log.Infof("Results for (%s): %+v\n", url, resp)
+	log.Debugf("Results for (%s): %+v\n", url, resp)
 
 	return nil
 }
@@ -160,6 +160,6 @@ func HTTPDel(url string) error {
 		return fmt.Errorf("HTTP error response. Status: %s, StatusCode: %d", res.Status, res.StatusCode)
 	}
 
-	log.Infof("Results for (%s): %+v\n", url, res)
+	log.Debugf("Results for (%s): %+v\n", url, res)
 	return nil
 }

utils/netutils/netutils.go

@@ -755,6 +755,30 @@ func GetLocalAddrList() ([]string, error) {
 	return addrList, err
 }
 
+//GetHostLowestLinkMtu return lowest mtu for host interface(excluding ovs
+//interface
+func GetHostLowestLinkMtu() (int, error) {
+
+	lowestMTU := 9000 //Jumbo frame MTU
+	intfList, err := net.Interfaces()
+	if err != nil {
+		return 0, err
+	}
+	// Loop thru each interface and add its ip addr to list
+	for _, intf := range intfList {
+		if strings.HasPrefix(intf.Name, "docker") || strings.HasPrefix(intf.Name, "veth") ||
+			strings.HasPrefix(intf.Name, "vport") || strings.HasPrefix(intf.Name, "lo") {
+			continue
+		}
+
+		lowestMTU = int(math.Min(float64(lowestMTU), float64(intf.MTU)))
+	}
+	if lowestMTU == 0 {
+		return 0, errors.New("Failed to find minimum MTU")
+	}
+	return lowestMTU, nil
+}
+
 // IsAddrLocal check if an address is local
 func IsAddrLocal(findAddr string) bool {
 	// get the local addr list