fix: wrong deletion in gc lb and portgroup

kubeovn · Dec 22, 2019 · 518c0a7 · 518c0a7
1 parent e5f5541
commit 518c0a7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -325,6 +325,8 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
 
 	go wait.Until(c.runAddIpPoolPodWorker, time.Second, stopCh)
 	go wait.Until(c.runAddNamespaceWorker, time.Second, stopCh)
+	go wait.Until(c.runDeleteTcpServiceWorker, time.Second, stopCh)
+	go wait.Until(c.runDeleteUdpServiceWorker, time.Second, stopCh)
 	for i := 0; i < c.config.WorkerNum; i++ {
 		go wait.Until(c.runAddPodWorker, time.Second, stopCh)
 		go wait.Until(c.runDeletePodWorker, time.Second, stopCh)
@@ -340,9 +342,6 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
 		go wait.Until(c.runDeleteNodeWorker, time.Second, stopCh)
 
 		go wait.Until(c.runUpdateServiceWorker, time.Second, stopCh)
-		go wait.Until(c.runDeleteTcpServiceWorker, time.Second, stopCh)
-		go wait.Until(c.runDeleteUdpServiceWorker, time.Second, stopCh)
-
 		go wait.Until(c.runUpdateEndpointWorker, time.Second, stopCh)
 
 		go wait.Until(c.runUpdateNpWorker, time.Second, stopCh)
@@ -497,7 +496,7 @@ func (c *Controller) gcLoadBalancer() error {
 		klog.Errorf("failed to get udp lb vips %v", err)
 		return err
 	}
-	for _, vip := range vips {
+	for vip := range vips {
 		if !util.IsStringIn(vip, tcpVips) {
 			err := c.ovnClient.DeleteLoadBalancerVip(vip, c.config.ClusterTcpLoadBalancer)
 			if err != nil {
@@ -517,7 +516,7 @@ func (c *Controller) gcLoadBalancer() error {
 		klog.Errorf("failed to get udp lb vips %v", err)
 		return err
 	}
-	for _, vip := range vips {
+	for vip := range vips {
 		if !util.IsStringIn(vip, udpVips) {
 			err := c.ovnClient.DeleteLoadBalancerVip(vip, c.config.ClusterUdpLoadBalancer)
 			if err != nil {

diff --git a/pkg/controller/endpoint.go b/pkg/controller/endpoint.go
@@ -121,7 +121,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
 		if port.Protocol == v1.ProtocolTCP {
 			// for performance reason delete lb with no backends
 			if len(backends) > 0 {
-				err = c.ovnClient.CreateLoadBalancerRule(c.config.ClusterTcpLoadBalancer, vip, getServicePortBackends(ep, port, clusterIP))
+				err = c.ovnClient.CreateLoadBalancerRule(c.config.ClusterTcpLoadBalancer, vip, getServicePortBackends(ep, port, clusterIP), string(port.Protocol))
 				if err != nil {
 					klog.Errorf("failed to update vip %s to tcp lb, %v", vip, err)
 					return err
@@ -135,7 +135,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
 			}
 		} else {
 			if len(backends) > 0 {
-				err = c.ovnClient.CreateLoadBalancerRule(c.config.ClusterUdpLoadBalancer, vip, getServicePortBackends(ep, port, clusterIP))
+				err = c.ovnClient.CreateLoadBalancerRule(c.config.ClusterUdpLoadBalancer, vip, getServicePortBackends(ep, port, clusterIP), string(port.Protocol))
 				if err != nil {
 					klog.Errorf("failed to update vip %s to udp lb, %v", vip, err)
 					return err

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -303,8 +303,8 @@ func (c Client) CreateLoadBalancer(lb, protocol string) error {
 }
 
 // CreateLoadBalancerRule create loadbalancer rul in ovn
-func (c Client) CreateLoadBalancerRule(lb, vip, ips string) error {
-	_, err := c.ovnNbCommand(MayExist, "lb-add", lb, vip, ips)
+func (c Client) CreateLoadBalancerRule(lb, vip, ips, protocol string) error {
+	_, err := c.ovnNbCommand(MayExist, "lb-add", lb, vip, ips, strings.ToLower(protocol))
 	return err
 }
 
@@ -315,7 +315,12 @@ func (c Client) addLoadBalancerToLogicalSwitch(lb, ls string) error {
 
 // DeleteLoadBalancerVip delete a vip rule from loadbalancer
 func (c Client) DeleteLoadBalancerVip(vip, lb string) error {
-	_, err := c.ovnNbCommand(IfExists, "lb-del", lb, vip)
+	existVips, err := c.GetLoadBalancerVips(lb)
+	// vip is empty or delete last rule will destroy the loadbalancer
+	if vip == "" || len(existVips) == 1 || existVips[vip] == "" {
+		return nil
+	}
+	_, err = c.ovnNbCommand(IfExists, "lb-del", lb, vip)
 	return err
 }
 
@@ -496,7 +501,7 @@ func (c Client) ListPortGroup() ([]portGroup, error) {
 			continue
 		}
 		name := strings.TrimSpace(parts[0])
-		np := strings.Split(strings.TrimSpace(parts[1]), "/")
+		np := strings.Split(strings.TrimPrefix(strings.TrimSpace(parts[1]), "np="), "/")
 		if len(np) != 2 {
 			continue
 		}