libovsdb: use monitor_cond as the monitor method

kubeovn · Apr 9, 2023 · 3a5eca6 · 3a5eca6
1 parent c0ab835
commit 3a5eca6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/pkg/ovs/ovn-nb-suite_test.go b/pkg/ovs/ovn-nb-suite_test.go
@@ -717,20 +717,20 @@ func newNbClient(addr string, timeout int) (client.Client, error) {
 	}
 
 	monitorOpts := []client.MonitorOption{
-		client.WithTable(&ovnnb.LogicalRouter{}),
-		client.WithTable(&ovnnb.LogicalRouterPort{}),
+		client.WithTable(&ovnnb.ACL{}),
+		client.WithTable(&ovnnb.AddressSet{}),
+		client.WithTable(&ovnnb.DHCPOptions{}),
+		client.WithTable(&ovnnb.GatewayChassis{}),
+		client.WithTable(&ovnnb.LoadBalancer{}),
 		client.WithTable(&ovnnb.LogicalRouterPolicy{}),
+		client.WithTable(&ovnnb.LogicalRouterPort{}),
 		client.WithTable(&ovnnb.LogicalRouterStaticRoute{}),
-		client.WithTable(&ovnnb.NAT{}),
-		client.WithTable(&ovnnb.LogicalSwitch{}),
+		client.WithTable(&ovnnb.LogicalRouter{}),
 		client.WithTable(&ovnnb.LogicalSwitchPort{}),
-		client.WithTable(&ovnnb.PortGroup{}),
+		client.WithTable(&ovnnb.LogicalSwitch{}),
+		client.WithTable(&ovnnb.NAT{}),
 		client.WithTable(&ovnnb.NBGlobal{}),
-		client.WithTable(&ovnnb.GatewayChassis{}),
-		client.WithTable(&ovnnb.LoadBalancer{}),
-		client.WithTable(&ovnnb.AddressSet{}),
-		client.WithTable(&ovnnb.ACL{}),
-		client.WithTable(&ovnnb.DHCPOptions{}),
+		client.WithTable(&ovnnb.PortGroup{}),
 	}
 	if _, err = c.Monitor(context.TODO(), c.NewMonitor(monitorOpts...)); err != nil {
 		return nil, err

diff --git a/pkg/ovsdb/client/client.go b/pkg/ovsdb/client/client.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/cenkalti/backoff/v4"
 	"github.com/ovn-org/libovsdb/client"
-
+	"github.com/ovn-org/libovsdb/ovsdb"
 	"k8s.io/klog/v2"
 
 	"github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb"
@@ -93,23 +93,24 @@ func NewNbClient(addr string) (client.Client, error) {
 		return nil, err
 	}
 
-	monitorOpts := []client.MonitorOption{
-		client.WithTable(&ovnnb.LogicalRouter{}),
-		client.WithTable(&ovnnb.LogicalRouterPort{}),
+	monitor := c.NewMonitor(
+		client.WithTable(&ovnnb.ACL{}),
+		client.WithTable(&ovnnb.AddressSet{}),
+		client.WithTable(&ovnnb.DHCPOptions{}),
+		client.WithTable(&ovnnb.GatewayChassis{}),
+		client.WithTable(&ovnnb.LoadBalancer{}),
 		client.WithTable(&ovnnb.LogicalRouterPolicy{}),
+		client.WithTable(&ovnnb.LogicalRouterPort{}),
 		client.WithTable(&ovnnb.LogicalRouterStaticRoute{}),
-		client.WithTable(&ovnnb.NAT{}),
-		client.WithTable(&ovnnb.LogicalSwitch{}),
+		client.WithTable(&ovnnb.LogicalRouter{}),
 		client.WithTable(&ovnnb.LogicalSwitchPort{}),
+		client.WithTable(&ovnnb.LogicalSwitch{}),
+		client.WithTable(&ovnnb.NAT{}),
 		client.WithTable(&ovnnb.NBGlobal{}),
 		client.WithTable(&ovnnb.PortGroup{}),
-		client.WithTable(&ovnnb.GatewayChassis{}),
-		client.WithTable(&ovnnb.LoadBalancer{}),
-		client.WithTable(&ovnnb.AddressSet{}),
-		client.WithTable(&ovnnb.ACL{}),
-		client.WithTable(&ovnnb.DHCPOptions{}),
-	}
-	if _, err = c.Monitor(context.TODO(), c.NewMonitor(monitorOpts...)); err != nil {
+	)
+	monitor.Method = ovsdb.ConditionalMonitorRPC
+	if _, err = c.Monitor(context.TODO(), monitor); err != nil {
 		klog.Errorf("failed to monitor database on OVN NB server %s: %v", addr, err)
 		return nil, err
 	}