Repository navigation
[Draft]Remove local LB targets #525
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ import ( | |
| "github.com/ironcore-dev/metalbond/pb" | ||
| metalnetv1alpha1 "github.com/ironcore-dev/metalnet/api/v1alpha1" | ||
| metalnetclient "github.com/ironcore-dev/metalnet/client" | ||
| "github.com/ironcore-dev/metalnet/internal" | ||
| "github.com/ironcore-dev/metalnet/metalbond" | ||
| "github.com/ironcore-dev/metalnet/netfns" | ||
| "github.com/ironcore-dev/metalnet/sysfs" | ||
|
|
@@ -81,8 +82,9 @@ type NetworkInterfaceReconciler struct { | |
|
|
||
| Scheme *runtime.Scheme | ||
|
|
||
| DPDK dpdkclient.Client | ||
| RouteUtil metalbond.RouteUtil | ||
| DPDK dpdkclient.Client | ||
| RouteUtil metalbond.RouteUtil | ||
| MetalnetCache *internal.MetalnetCache | ||
|
|
||
| NetFnsManager *netfns.Manager | ||
| SysFS sysfs.FS | ||
|
|
@@ -305,7 +307,7 @@ func (r *NetworkInterfaceReconciler) removePrefixRouteIfExists(ctx context.Conte | |
| return nil | ||
| } | ||
|
|
||
| func (r *NetworkInterfaceReconciler) addLBTargetRouteIfNotExists(ctx context.Context, vni uint32, prefix netip.Prefix, underlayRoute netip.Addr) error { | ||
| func (r *NetworkInterfaceReconciler) announceLBTargetRouteIfNotExists(ctx context.Context, vni uint32, prefix netip.Prefix, underlayRoute netip.Addr) error { | ||
| if err := r.RouteUtil.AnnounceRoute(ctx, metalbond.VNI(vni), metalbond.Destination{ | ||
| Prefix: prefix, | ||
| }, metalbond.NextHop{ | ||
|
|
@@ -318,7 +320,7 @@ func (r *NetworkInterfaceReconciler) addLBTargetRouteIfNotExists(ctx context.Con | |
| return nil | ||
| } | ||
|
|
||
| func (r *NetworkInterfaceReconciler) removeLBTargetRouteIfExists(ctx context.Context, vni uint32, prefix netip.Prefix, underlayRoute netip.Addr) error { | ||
| func (r *NetworkInterfaceReconciler) withdrawLBTargetRouteIfExists(ctx context.Context, vni uint32, prefix netip.Prefix, underlayRoute netip.Addr) error { | ||
| if err := r.RouteUtil.WithdrawRoute(ctx, metalbond.VNI(vni), metalbond.Destination{ | ||
| Prefix: prefix, | ||
| }, metalbond.NextHop{ | ||
|
|
@@ -460,7 +462,7 @@ func (r *NetworkInterfaceReconciler) deleteDPDKfwRuleIDIfExists(ctx context.Cont | |
| return nil | ||
| } | ||
|
|
||
| func (r *NetworkInterfaceReconciler) deleteDPDKLBTargetIfExists(ctx context.Context, nicUID types.UID, prefix netip.Prefix) error { | ||
| func (r *NetworkInterfaceReconciler) deleteDPDKLBPrefixIfExists(ctx context.Context, nicUID types.UID, prefix netip.Prefix) error { | ||
| if _, err := r.DPDK.DeleteLoadBalancerPrefix( | ||
| ctx, | ||
| string(nicUID), | ||
|
|
@@ -1079,33 +1081,52 @@ func (r *NetworkInterfaceReconciler) reconcileLBTargets(ctx context.Context, log | |
| if err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Ensuring metalbond prefix route does not exist") | ||
| if err := r.removeLBTargetRouteIfExists(ctx, vni, prefix, underlayRoute); err != nil { | ||
| log.V(1).Info("Withdrawing metalbond lb target route") | ||
| if err := r.withdrawLBTargetRouteIfExists(ctx, vni, prefix, underlayRoute); err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Ensured metalbond prefix route does not exist") | ||
| log.V(1).Info("Withdrew metalbond lb target route") | ||
|
|
||
| log.V(1).Info("Ensuring dpdk lb target does not exist") | ||
| if err := r.deleteDPDKLBTargetIfExists(ctx, nic.UID, prefix); err != nil { | ||
| log.V(1).Info("Deleting local dpdk lb target") | ||
| if uid, ok := r.MetalnetCache.GetLoadBalancerServer(vni, prefix.Addr().String()); ok { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Guard
Add a dedicated lock and hold it in all three methods: Suggested fix
|
||
| if _, err := r.DPDK.DeleteLoadBalancerTarget(ctx, string(uid), &underlayRoute, | ||
| dpdkerrors.Ignore(dpdkerrors.NOT_FOUND, dpdkerrors.NO_BACKIP, dpdkerrors.NO_LB)); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| log.V(1).Info("Deleted local dpdk lb target") | ||
|
|
||
| log.V(1).Info("Deleting dpdk lb prefix") | ||
| if err := r.deleteDPDKLBPrefixIfExists(ctx, nic.UID, prefix); err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Ensured dpdk lb target does not exist") | ||
| log.V(1).Info("Deleted dpdk lb prefix") | ||
| return nil | ||
| case specPrefixes.Has(prefix) && !dpdkPrefixes.Has(prefix): | ||
| log.V(1).Info("Create lb target") | ||
|
|
||
| log.V(1).Info("Creating dpdk lb target") | ||
| log.V(1).Info("Creating dpdk lb prefix") | ||
| resPrefix, err := r.DPDK.CreateLoadBalancerPrefix(ctx, &dpdk.LoadBalancerPrefix{ | ||
| LoadBalancerPrefixMeta: dpdk.LoadBalancerPrefixMeta{InterfaceID: string(nic.UID)}, | ||
| Spec: dpdk.LoadBalancerPrefixSpec{Prefix: prefix}, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Ensured dpdk lb target exists") | ||
|
|
||
| // Install THIS node's backend into its own LB table. | ||
| if uid, ok := r.MetalnetCache.GetLoadBalancerServer(vni, prefix.Addr().String()); ok { | ||
| if _, err := r.DPDK.CreateLoadBalancerTarget(ctx, &dpdk.LoadBalancerTarget{ | ||
| LoadBalancerTargetMeta: dpdk.LoadBalancerTargetMeta{LoadbalancerID: string(uid)}, | ||
| Spec: dpdk.LoadBalancerTargetSpec{TargetIP: resPrefix.Spec.UnderlayRoute}, | ||
| }, dpdkerrors.Ignore(dpdkerrors.ALREADY_EXISTS)); err != nil { | ||
| return err | ||
|
Comment on lines
+1119
to
+1123
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Retry local target creation in the existing-prefix branch. When Create the local target in the default branch as well, ignoring Suggested fix
|
||
| } | ||
| } | ||
| log.V(1).Info("Ensured dpdk lb prefix and local lb target exist") | ||
|
|
||
| log.V(1).Info("Ensuring metalbond lb target route exists") | ||
| if err := r.addLBTargetRouteIfNotExists(ctx, vni, prefix, *resPrefix.Spec.UnderlayRoute); err != nil { | ||
| if err := r.announceLBTargetRouteIfNotExists(ctx, vni, prefix, *resPrefix.Spec.UnderlayRoute); err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Ensured metalbond lb target route exists") | ||
|
|
@@ -1128,7 +1149,7 @@ func (r *NetworkInterfaceReconciler) reconcileLBTargets(ctx context.Context, log | |
| } | ||
| underlayRouteAnnounced := r.RouteUtil.IsRouteAnnounced(ctx, metalbond.VNI(vni), dest, nextHop) | ||
| if !underlayRouteAnnounced { | ||
| if err := r.addLBTargetRouteIfNotExists(ctx, vni, prefix, underlayRoute); err != nil { | ||
| if err := r.announceLBTargetRouteIfNotExists(ctx, vni, prefix, underlayRoute); err != nil { | ||
| return err | ||
| } | ||
| } else { | ||
|
|
@@ -1507,17 +1528,25 @@ func (r *NetworkInterfaceReconciler) deleteLBTargets( | |
| prefix := prefixItem.Spec.Prefix | ||
| log := log.WithValues("LB Target", prefix) | ||
| if err := func() error { | ||
| log.V(1).Info("Removing lb targets route if exists") | ||
| if err := r.removeLBTargetRouteIfExists(ctx, vni, prefix, *prefixItem.Spec.UnderlayRoute); err != nil { | ||
| log.V(1).Info("Withdrawing metalbond lb target route if exists") | ||
| // Tell remote nodes to stop using this backend | ||
| if err := r.withdrawLBTargetRouteIfExists(ctx, vni, prefix, *prefixItem.Spec.UnderlayRoute); err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Removed lb target route if existed") | ||
| // Tell the local dpservice to stop using this backend | ||
| if uid, ok := r.MetalnetCache.GetLoadBalancerServer(vni, prefix.Addr().String()); ok { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Restore the LB cache before NIC cleanup, or stop cleanup on a cache miss. After a restart with dpservice state retained, Rebuild the cache from dpservice at startup, before the NIC controller reconciles. Alternatively, return an error on a cache miss instead of deleting the prefix. The error option must not block finalizer removal when the LB no longer exists. This change needs a design decision and tests for restart ordering.
|
||
| if _, err := r.DPDK.DeleteLoadBalancerTarget(ctx, string(uid), prefixItem.Spec.UnderlayRoute, | ||
| dpdkerrors.Ignore(dpdkerrors.NOT_FOUND, dpdkerrors.NO_BACKIP, dpdkerrors.NO_LB)); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| log.V(1).Info("Withdrew metalbond lb target route and deleted local lb target if existed") | ||
|
|
||
| log.V(1).Info("Removing dpdk lb target if exists") | ||
| if err := r.deleteDPDKLBTargetIfExists(ctx, nic.UID, prefix); err != nil { | ||
| log.V(1).Info("Deleting dpdk lb prefix if exists") | ||
| if err := r.deleteDPDKLBPrefixIfExists(ctx, nic.UID, prefix); err != nil { | ||
| return err | ||
| } | ||
| log.V(1).Info("Removed dpdk lb target if existed") | ||
| log.V(1).Info("Deleted dpdk lb prefix if existed") | ||
| return nil | ||
| }(); err != nil { | ||
| errs = append(errs, fmt.Errorf("[lb target %s] %w", prefix, err)) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Register NIC cleanup before the assertions.
If the assertion at Line 1499 fails, the test never reaches the NIC deletion at Line 1502. The registered callbacks clean up the LB and network, but leave the NIC in shared dpservice state. Namespace teardown does not invoke NIC reconciliation. (raw.githubusercontent.com)
Register a
DeferCleanupcallback after NIC creation. Make it tolerate an already-deleted object and invokeifaceReconcile, so it also works after the explicit deletion succeeds.