Merge pull request #92 from qiangzii/master

reserve 64 ip for vlan when vxnet mask is 24;
fix hostnic-controller and hostnic-node log;

Author: yongchuanzhou

cmd/controller/main.go

@@ -45,8 +45,6 @@ var qps, burst int
 
 func main() {
 	klog.InitFlags(goflag.CommandLine)
-	goflag.Set("logtostderr", "false")
-	goflag.Set("alsologtostderr", "true")
 	flag.IntVar(&qps, "k8s-api-qps", 80, "maximum QPS to k8s apiserver from this client.")
 	flag.IntVar(&burst, "k8s-api-burst", 100, "maximum burst for throttle from this client.")
 	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)

cmd/hostnic/ipam/ipam.go

@@ -146,6 +146,7 @@ func AddrUnalloc(args *skel.CmdArgs, peek bool) (*rpc.IPAMMessage, error) {
 	} else {
 		if err := networkutils.NetworkHelper.CleanupPodNetwork(reply.Nic, reply.IP); err != nil {
 			logrus.Errorf("clean %v %s network failed: %v", reply.Nic, reply.IP, err)
+			//HOSTNIC_TODO: try to cleanup ebtables rules once there
 		}
 	}
 

cmd/ipam/main.go

@@ -47,8 +47,6 @@ var qps, burst, metricsPort int
 func main() {
 	//parse flag and setup klog
 	log.InitFlags(flag.CommandLine)
-	flag.Set("logtostderr", "false")
-	flag.Set("alsologtostderr", "true")
 	flag.IntVar(&qps, "k8s-api-qps", 80, "maximum QPS to k8s apiserver from this client.")
 	flag.IntVar(&burst, "k8s-api-burst", 100, "maximum burst for throttle from this client.")
 	flag.IntVar(&metricsPort, "metrics-port", 9191, "metrics port")

pkg/allocator/allocator.go

@@ -261,7 +261,7 @@ func (a *Allocator) FreeHostNic(args *rpc.PodInfo, peek bool) (*rpc.HostNic, str
 	for _, status := range a.nics {
 		if pod, ok := status.Pods[getContainterKey(args)]; ok {
 			if err := a.delNicPod(status.Nic, pod); err != nil {
-				log.Errorf("delNicPod failed: %s %s %v", getNicKey(status.Nic), getPodKey(args), err)
+				log.Errorf("delNicPod failed: %s %s %v", getNicKey(status.Nic), getPodKey(args), err) //HOSTNIC_TODO:the error was not return, why?
 			}
 			return status.Nic, pod.PodIP, nil
 		}

pkg/qcclient/wrapper.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
+	"net"
 	"os"
 	"time"
 
@@ -25,11 +26,15 @@ const (
 	defaultWaitInterval = 5 * time.Second
 
 	reservedVIPCount              = 12
-	reservedVIPCountForVlan int64 = 7
+	reservedVIPCountForVlan int64 = 7 //reserve 1/7 ip for hostnic br
 
 	TunnelTypeVlan = "vlan"
 )
 
+var (
+	customReservedIPCount int64 = 0
+)
+
 type Options struct {
 	Tag string
 }
@@ -468,9 +473,19 @@ func (q *qingcloudAPIWrapper) getVxNets(ids []string, public bool) ([]*rpc.VxNet
 				vxnetItem.TunnelType = *qcVxNet.TunnelType
 			}
 			if vxnetItem.TunnelType == TunnelTypeVlan {
-				vxnetItem.IPEnd = getIPEndAfterReservedForVlan(*qcVxNet.Router.DYNIPStart, *qcVxNet.Router.DYNIPEnd, reservedVIPCountForVlan)
+				// parse ip_network to get mask; if mask is 24, reserve more ip than specifc in config
+				_, ipNet, err := net.ParseCIDR(vxnetItem.Network)
+				if err != nil {
+					log.Errorf("parse ip_network to get mask error: %v", err)
+				}
+				maskLength, _ := ipNet.Mask.Size()
+				if maskLength == 24 {
+					log.Infof("vxnet %s ip network %s mask is 24, reserve another 64 ip", *qcVxNet.VxNetID, vxnetItem.Network)
+					customReservedIPCount = 64
+				}
+				vxnetItem.IPEnd = getIPEndAfterReservedForVlan(*qcVxNet.Router.DYNIPStart, *qcVxNet.Router.DYNIPEnd, reservedVIPCountForVlan, customReservedIPCount)
 			} else {
-				vxnetItem.IPEnd = getIPEndAfterReserved(*qcVxNet.Router.DYNIPEnd, reservedVIPCount)
+				vxnetItem.IPEnd = getIPEndAfterReserved(*qcVxNet.Router.DYNIPEnd, reservedVIPCount, customReservedIPCount)
 			}
 		} else {
 			return nil, fmt.Errorf("vxnet %s should bind to vpc", *qcVxNet.VxNetID)
@@ -746,15 +761,15 @@ func IPRangeCount(from, to string) int {
 	return int(big.NewInt(0).Sub(endInt, startInt).Int64() + 1)
 }
 
-func getIPEndAfterReserved(end string, reservedCount int64) string {
+func getIPEndAfterReserved(end string, reservedCount, customReservedCount int64) string {
 	e := cnet.ParseIP(end)
-	i := big.NewInt(0).Sub(cnet.IPToBigInt(*e), big.NewInt(reservedCount))
+	i := big.NewInt(0).Sub(cnet.IPToBigInt(*e), big.NewInt(reservedCount+customReservedCount))
 	return cnet.BigIntToIP(i).String()
 }
 
-func getIPEndAfterReservedForVlan(start, end string, reservedCount int64) string {
+func getIPEndAfterReservedForVlan(start, end string, reservedCount, customReservedCount int64) string {
 	s := cnet.ParseIP(start)
 	e := cnet.ParseIP(end)
-	i := big.NewInt(0).Sub(cnet.IPToBigInt(*e), big.NewInt((cnet.IPToBigInt(*e).Int64()-cnet.IPToBigInt(*s).Int64()+1)/reservedCount))
+	i := big.NewInt(0).Sub(cnet.IPToBigInt(*e), big.NewInt((cnet.IPToBigInt(*e).Int64()-cnet.IPToBigInt(*s).Int64()+1)/reservedCount+customReservedCount))
 	return cnet.BigIntToIP(i).String()
 }