adsfasdf

openshift · Oct 30, 2019 · 9f2ffc1 · 9f2ffc1
1 parent 1b20ccf
commit 9f2ffc1
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/go-controller/pkg/cluster/gateway_localnet.go b/go-controller/pkg/cluster/gateway_localnet.go
@@ -150,12 +150,7 @@ func initLocalnetGateway(nodeName string, clusterIPSubnet []string,
 	}
 
 	go func() {
-		stdout, stderr, err := util.RunIP("addr", "show", "dev", localnetBridgeNextHop)
-		if err != nil {
-			logrus.Info("####E %s: %s", time.Now(), stderr)
-		} else {
-			logrus.Info("##### %s: %s", time.Now(), stdout)
-		}
+		printBrnexthop("recurring")
 		time.Sleep(1)
 	}()
 
@@ -172,26 +167,39 @@ func initLocalnetGateway(nodeName string, clusterIPSubnet []string,
 	if err != nil {
 		return fmt.Errorf("failed to set up shared interface gateway: %v", err)
 	}
+	printBrnexthop("1")
 
 	err = util.GatewayInit(clusterIPSubnet, nodeName, ifaceID, localnetGatewayIP,
 		macAddress, localnetGatewayNextHop, subnet, true, nil)
 	if err != nil {
 		return fmt.Errorf("failed to localnet gateway: %v", err)
 	}
+	printBrnexthop("2")
 
 	err = localnetGatewayNAT(ipt, localnetBridgeNextHop, localnetGatewayIP)
 	if err != nil {
 		return fmt.Errorf("Failed to add NAT rules for localnet gateway (%v)",
 			err)
 	}
+	printBrnexthop("3")
 
 	if config.Gateway.NodeportEnable {
 		return localnetNodePortWatcher(ipt, wf)
 	}
+	printBrnexthop("4")
 
 	return nil
 }
 
+func printBrnexthop(detail string) {
+	stdout, stderr, err := util.RunIP("addr", "show", "dev", "br-nexthop")
+	if err != nil {
+		logrus.Info("####E [%s] %s: %s", detail, time.Now(), stderr)
+	} else {
+		logrus.Info("##### [%s] %s: %s", detail, time.Now(), stdout)
+	}
+}
+
 func localnetIptRules(svc *kapi.Service) []iptRule {
 	rules := make([]iptRule, 0)
 	for _, svcPort := range svc.Spec.Ports {