add log for ecmp route

kubeovn · Dec 30, 2021 · 09ef9be · 09ef9be
1 parent b59f522
commit 09ef9be
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -605,62 +605,62 @@ func (c *Controller) checkGatewayReady() error {
 					if util.CheckProtocol(cidrBlock) != util.CheckProtocol(ip) {
 						continue
 					}
-				}
 
-				exist, err := c.checkNodeEcmpRouteExist(ip, cidrBlock)
-				if err != nil {
-					klog.Errorf("get ecmp static route for subnet %v, error %v", subnet.Name, err)
-					break
-				}
-
-				if util.GatewayContains(subnet.Spec.GatewayNode, node.Name) {
-					pinger, err := goping.NewPinger(ip)
+					exist, err := c.checkNodeEcmpRouteExist(ip, cidrBlock)
 					if err != nil {
-						return fmt.Errorf("failed to init pinger, %v", err)
+						klog.Errorf("get ecmp static route for subnet %v, error %v", subnet.Name, err)
+						break
 					}
-					pinger.SetPrivileged(true)
 
-					count := 5
-					pinger.Count = count
-					pinger.Timeout = time.Duration(count) * time.Second
-					pinger.Interval = 1 * time.Second
+					if util.GatewayContains(subnet.Spec.GatewayNode, node.Name) {
+						pinger, err := goping.NewPinger(ip)
+						if err != nil {
+							return fmt.Errorf("failed to init pinger, %v", err)
+						}
+						pinger.SetPrivileged(true)
 
-					success := false
-					pinger.OnRecv = func(p *goping.Packet) {
-						success = true
-						pinger.Stop()
-					}
-					pinger.Run()
+						count := 5
+						pinger.Count = count
+						pinger.Timeout = time.Duration(count) * time.Second
+						pinger.Interval = 1 * time.Second
 
-					if !nodeReady(node) {
-						success = false
-					}
+						success := false
+						pinger.OnRecv = func(p *goping.Packet) {
+							success = true
+							pinger.Stop()
+						}
+						pinger.Run()
 
-					if !success {
-						klog.Warningf("failed to ping ovn0 %s or node %v is not ready", ip, node.Name)
-						if exist {
-							if err := c.ovnClient.DeleteMatchedStaticRoute(cidrBlock, ip, c.config.ClusterRouter); err != nil {
-								klog.Errorf("failed to delete static route %s for node %s, %v", ip, node.Name, err)
-								return err
+						if !nodeReady(node) {
+							success = false
+						}
+
+						if !success {
+							klog.Warningf("failed to ping ovn0 %s or node %v is not ready", ip, node.Name)
+							if exist {
+								if err := c.ovnClient.DeleteMatchedStaticRoute(cidrBlock, ip, c.config.ClusterRouter); err != nil {
+									klog.Errorf("failed to delete static route %s for node %s, %v", ip, node.Name, err)
+									return err
+								}
+							}
+						} else {
+							klog.V(3).Infof("succeed to ping gw %s", ip)
+							if !exist {
+								if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, subnet.Spec.CIDRBlock, ip, c.config.ClusterRouter, util.EcmpRouteType); err != nil {
+									klog.Errorf("failed to add static route for node %s, %v", node.Name, err)
+									return err
+								}
 							}
 						}
 					} else {
-						klog.V(3).Infof("succeed to ping gw %s", ip)
-						if !exist {
-							if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, subnet.Spec.CIDRBlock, ip, c.config.ClusterRouter, util.EcmpRouteType); err != nil {
-								klog.Errorf("failed to add static route for node %s, %v", node.Name, err)
+						if exist {
+							klog.Infof("subnet %v gatewayNode does not contains node %v, should delete ecmp route for node ip %s", subnet.Name, node.Name, ip)
+							if err := c.ovnClient.DeleteMatchedStaticRoute(cidrBlock, ip, c.config.ClusterRouter); err != nil {
+								klog.Errorf("failed to delete static route %s for node %s, %v", ip, node.Name, err)
 								return err
 							}
 						}
 					}
-				} else {
-					if exist {
-						klog.Infof("subnet %v gatewayNode does not contains node %v, should delete ecmp route for node ip %s", subnet.Name, node.Name, ip)
-						if err := c.ovnClient.DeleteMatchedStaticRoute(cidrBlock, ip, c.config.ClusterRouter); err != nil {
-							klog.Errorf("failed to delete static route %s for node %s, %v", ip, node.Name, err)
-							return err
-						}
-					}
 				}
 			}
 		}

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -1008,8 +1008,11 @@ func (c *Controller) reconcileGateway(subnet *kubeovnv1.Subnet) error {
 						continue
 					}
 					nodeIPs = append(nodeIPs, strings.Split(nodeTunlIP, ",")...)
+				} else {
+					klog.Errorf("gateway node %v is not ready", gw)
 				}
 			}
+			klog.Infof("subnet %s configure gateway node, nodeIPs %v", subnet.Name, nodeIPs)
 
 			for _, cidr := range strings.Split(subnet.Spec.CIDRBlock, ",") {
 				nextHops, err := c.filterRepeatEcmpRoutes(nodeIPs, cidr)

diff --git a/pkg/util/net.go b/pkg/util/net.go
@@ -424,7 +424,7 @@ func GatewayContains(gatewayNodeStr, gateway string) bool {
 		} else {
 			gw = strings.TrimSpace(gw)
 		}
-		if gw == gateway {
+		if gw == strings.TrimSpace(gateway) {
 			return true
 		}
 	}