chore: suppress verbose logs

kubeovn · Aug 27, 2020 · 28d5a8a · 28d5a8a
1 parent e779a09
commit 28d5a8a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/pkg/controller/gc.go b/pkg/controller/gc.go
@@ -100,6 +100,7 @@ func (c *Controller) gcNode() error {
 }
 
 func (c *Controller) gcLogicalSwitchPort() error {
+	klog.Info("start to gc logical switch port")
 	if err := c.markAndCleanLSP(); err != nil {
 		return err
 	}
@@ -108,7 +109,7 @@ func (c *Controller) gcLogicalSwitchPort() error {
 }
 
 func (c *Controller) markAndCleanLSP() error {
-	klog.Infof("start to gc logical switch ports")
+	klog.V(4).Infof("start to gc logical switch ports")
 	pods, err := c.podsLister.List(labels.Everything())
 	if err != nil {
 		klog.Errorf("failed to list ip, %v", err)

diff --git a/pkg/ovs/ovn-ic-nbctl.go b/pkg/ovs/ovn-ic-nbctl.go
@@ -13,7 +13,11 @@ func (c Client) ovnIcNbCommand(cmdArgs ...string) (string, error) {
 	cmdArgs = append([]string{fmt.Sprintf("--timeout=%d", c.OvnTimeout), fmt.Sprintf("--db=tcp:%s", c.OVNIcNBAddress)}, cmdArgs...)
 	raw, err := exec.Command(OVNIcNbCtl, cmdArgs...).CombinedOutput()
 	elapsed := float64((time.Since(start)) / time.Millisecond)
-	klog.Infof("%s command %s in %vms", OVNIcNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	klog.V(4).Infof("%s command %s in %vms", OVNIcNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	if err != nil || elapsed > 500 {
+		klog.Warning("ovn-ic-nbctl command error or took too long")
+		klog.Warningf("%s %s in %vms", OVNIcNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	}
 	if err != nil {
 		return "", fmt.Errorf("%s, %q", raw, err)
 	}

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -19,7 +19,11 @@ func (c Client) ovnNbCommand(cmdArgs ...string) (string, error) {
 	cmdArgs = append([]string{fmt.Sprintf("--timeout=%d", c.OvnTimeout)}, cmdArgs...)
 	raw, err := exec.Command(OvnNbCtl, cmdArgs...).CombinedOutput()
 	elapsed := float64((time.Since(start)) / time.Millisecond)
-	klog.Infof("command %s %s in %vms", OvnNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	klog.V(4).Infof("command %s %s in %vms", OvnNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	if err != nil || elapsed > 500 {
+		klog.Warning("ovn-nbctl command error or took too long")
+		klog.Warningf("%s %s in %vms", OvnNbCtl, strings.Join(cmdArgs, " "), elapsed)
+	}
 	if err != nil {
 		return "", fmt.Errorf("%s, %q", raw, err)
 	}

diff --git a/pkg/ovs/ovn-sbctl.go b/pkg/ovs/ovn-sbctl.go
@@ -14,7 +14,11 @@ func (c Client) ovnSbCommand(cmdArgs ...string) (string, error) {
 	cmdArgs = append([]string{fmt.Sprintf("--timeout=%d", c.OvnTimeout), fmt.Sprintf("--db=%s", c.OvnSbAddress)}, cmdArgs...)
 	raw, err := exec.Command(OvnSbCtl, cmdArgs...).CombinedOutput()
 	elapsed := float64((time.Since(start)) / time.Millisecond)
-	klog.Infof("%s command %s in %vms", OvnSbCtl, strings.Join(cmdArgs, " "), elapsed)
+	klog.V(4).Infof("%s command %s in %vms", OvnSbCtl, strings.Join(cmdArgs, " "), elapsed)
+	if err != nil || elapsed > 500 {
+		klog.Warning("ovn-sbctl command error or took too long")
+		klog.Warningf("%s %s in %vms", OvnSbCtl, strings.Join(cmdArgs, " "), elapsed)
+	}
 	if err != nil {
 		return "", fmt.Errorf("%s, %q", raw, err)
 	}

diff --git a/pkg/ovs/ovs-vsctl.go b/pkg/ovs/ovs-vsctl.go
@@ -17,7 +17,11 @@ func Exec(args ...string) (string, error) {
 	args = append([]string{"--timeout=30"}, args...)
 	output, err := exec.Command("ovs-vsctl", args...).CombinedOutput()
 	elapsed := float64((time.Since(start)) / time.Millisecond)
-	klog.Infof("command ovs-vsctl %s in %vms", strings.Join(args, " "), elapsed)
+	klog.V(4).Infof("command ovs-vsctl %s in %vms", strings.Join(args, " "), elapsed)
+	if err != nil || elapsed > 500 {
+		klog.Warning("ovs-vsctl command error or took too long")
+		klog.Warningf("ovs-vsctl %s in %vms", strings.Join(args, " "), elapsed)
+	}
 	if err != nil {
 		return "", fmt.Errorf("failed to run 'ovs-vsctl %s': %v\n  %q", strings.Join(args, " "), err, output)
 	}