Fix Missing Policy Routes

Issue: networkservicemesh#685 Try to delete the rule even if the route deletion fails. For example when the belonging interface is deleted in parallel. Signed-off-by: Laszlo Kiraly <[email protected]>
Nordix · Oct 28, 2024 · a023094 · a023094
1 parent 4249ee8
commit a023094
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/common.go b/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/common.go
@@ -329,14 +329,16 @@ func delRuleOnly(ctx context.Context, handle *netlink.Handle, policy *networkser
 	return nil
 }
 
-func delRule(ctx context.Context, handle *netlink.Handle, policy *networkservice.PolicyRoute, tableID, linkIndex int, nsRTableKey netnsRTableNextID, nsRTableNextIDToConnID *genericsync.Map[netnsRTableNextID, string]) error {
-	if err := flushTable(ctx, handle, tableID, linkIndex); err != nil {
-		return err
+func delRule(ctx context.Context, handle *netlink.Handle, policy *networkservice.PolicyRoute, tableID, linkIndex int, nsRTableKey netnsRTableNextID, nsRTableNextIDToConnID *genericsync.Map[netnsRTableNextID, string]) (err error) {
+	if err = flushTable(ctx, handle, tableID, linkIndex); err == nil {
+		nsRTableNextIDToConnID.Delete(nsRTableKey)
 	}
-	nsRTableNextIDToConnID.Delete(nsRTableKey)
-
-	return delRuleOnly(ctx, handle, policy)
+	if errDelRule := delRuleOnly(ctx, handle, policy); errDelRule != nil {
+		return errDelRule
+	}
+	return err
 }
+
 func flushTable(ctx context.Context, handle *netlink.Handle, tableID, linkIndex int) error {
 	routes, err := handle.RouteListFiltered(netlink.FAMILY_ALL,
 		&netlink.Route{