Skip to content

Commit 2731e8e

Browse files
committed
libovsdb: use monitor_cond as the monitor method (#2627)
1 parent 71a8ffe commit 2731e8e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/ovsdb/client/client.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"github.com/cenkalti/backoff/v4"
1616
"github.com/ovn-org/libovsdb/client"
17+
"github.com/ovn-org/libovsdb/ovsdb"
1718
"k8s.io/klog/v2"
1819

1920
"github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb"
@@ -92,15 +93,16 @@ func NewNbClient(addr string) (client.Client, error) {
9293
return nil, err
9394
}
9495

95-
monitorOpts := []client.MonitorOption{
96+
monitor := c.NewMonitor(
9697
client.WithTable(&ovnnb.LogicalRouter{}),
9798
client.WithTable(&ovnnb.LogicalRouterPort{}),
9899
client.WithTable(&ovnnb.LogicalRouterPolicy{}),
99100
client.WithTable(&ovnnb.LogicalRouterStaticRoute{}),
100101
client.WithTable(&ovnnb.LogicalSwitchPort{}),
101102
client.WithTable(&ovnnb.PortGroup{}),
102-
}
103-
if _, err = c.Monitor(context.TODO(), c.NewMonitor(monitorOpts...)); err != nil {
103+
)
104+
monitor.Method = ovsdb.ConditionalMonitorRPC
105+
if _, err = c.Monitor(context.TODO(), monitor); err != nil {
104106
klog.Errorf("failed to monitor database on OVN NB server %s: %v", addr, err)
105107
return nil, err
106108
}

0 commit comments

Comments
 (0)