libovsdb: ignore not found error when listing objects with a filter (#…

…2900)
kubeovn · Jun 7, 2023 · d61a2ad · d61a2ad
1 parent 78f923a
commit d61a2ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/pkg/ovs/ovn-nb-logical_router_policy.go b/pkg/ovs/ovn-nb-logical_router_policy.go
@@ -2,8 +2,10 @@ package ovs
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/ovn-org/libovsdb/client"
 	"github.com/ovn-org/libovsdb/model"
 	"github.com/ovn-org/libovsdb/ovsdb"
 	"github.com/scylladb/go-set/strset"
@@ -302,6 +304,9 @@ func (c *ovnClient) listLogicalRouterPoliciesByFilter(lrName string, filter func
 	for _, uuid := range lr.Policies {
 		policy, err := c.GetLogicalRouterPolicyByUUID(uuid)
 		if err != nil {
+			if errors.Is(err, client.ErrNotFound) {
+				continue
+			}
 			return nil, err
 		}
 		if filter == nil || filter(policy) {

diff --git a/pkg/ovs/ovn-nb-logical_router_route.go b/pkg/ovs/ovn-nb-logical_router_route.go
@@ -2,8 +2,10 @@ package ovs
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/ovn-org/libovsdb/client"
 	"github.com/ovn-org/libovsdb/model"
 	"github.com/ovn-org/libovsdb/ovsdb"
 	"github.com/scylladb/go-set/strset"
@@ -313,6 +315,9 @@ func (c *ovnClient) listLogicalRouterStaticRoutesByFilter(lrName string, filter
 	for _, uuid := range lr.StaticRoutes {
 		route, err := c.GetLogicalRouterStaticRouteByUUID(uuid)
 		if err != nil {
+			if errors.Is(err, client.ErrNotFound) {
+				continue
+			}
 			return nil, err
 		}
 		if filter == nil || filter(route) {

diff --git a/pkg/ovs/ovn-nb-nat.go b/pkg/ovs/ovn-nb-nat.go
@@ -2,8 +2,10 @@ package ovs
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/ovn-org/libovsdb/client"
 	"github.com/ovn-org/libovsdb/model"
 	"github.com/ovn-org/libovsdb/ovsdb"
 
@@ -338,6 +340,9 @@ func (c *ovnClient) listLogicalRouterNatByFilter(lrName string, filter func(rout
 	for _, uuid := range lr.Nat {
 		nat, err := c.GetNATByUUID(uuid)
 		if err != nil {
+			if errors.Is(err, client.ErrNotFound) {
+				continue
+			}
 			return nil, err
 		}
 		if filter == nil || filter(nat) {