From 2731e8e3082480dc022b8d4ed5b666df910072c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Mon, 10 Apr 2023 10:08:50 +0800 Subject: [PATCH] libovsdb: use monitor_cond as the monitor method (#2627) --- pkg/ovsdb/client/client.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/ovsdb/client/client.go b/pkg/ovsdb/client/client.go index fc574a52577..dc89c6b06f6 100644 --- a/pkg/ovsdb/client/client.go +++ b/pkg/ovsdb/client/client.go @@ -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" @@ -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 }