Skip to content

Commit

Permalink
libovsdb: use monitor_cond as the monitor method (#2627)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzujian committed Apr 10, 2023
1 parent 71a8ffe commit 2731e8e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions pkg/ovsdb/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +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"
Expand Down Expand Up @@ -92,15 +93,16 @@ func NewNbClient(addr string) (client.Client, error) {
return nil, err
}

monitorOpts := []client.MonitorOption{
monitor := c.NewMonitor(
client.WithTable(&ovnnb.LogicalRouter{}),
client.WithTable(&ovnnb.LogicalRouterPort{}),
client.WithTable(&ovnnb.LogicalRouterPolicy{}),
client.WithTable(&ovnnb.LogicalRouterStaticRoute{}),
client.WithTable(&ovnnb.LogicalSwitchPort{}),
client.WithTable(&ovnnb.PortGroup{}),
}
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
}
Expand Down

0 comments on commit 2731e8e

Please sign in to comment.