Skip to content

Log error instead of returning when failing to remove rif entries. #651

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.

Sign up for GitHub

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

Merged
sonikajindal merged 1 commit into from
Feb 12, 2026
Merged

Log error instead of returning when failing to remove rif entries. #651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dataplane/saiserver/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,15 +991,15 @@ func (ri *routerInterface) RemoveRouterInterface(ctx context.Context, req *saipb
)),
).Build())
if err != nil {
return nil, err
slog.WarnContext(ctx, "failed to remove inputIfaceTable entry for RouterInterface", "err", err)
}

_, err = ri.dataplane.TableEntryRemove(ctx, fwdconfig.TableEntryRemoveRequest(ri.dataplane.ID(), outputIfaceTable).
AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_OUTPUT_IFACE).WithUint64(req.GetOid()))),
).Build())
if err != nil {
return nil, err
slog.WarnContext(ctx, "failed to remove outputIfaceTable entry for RouterInterface", "err", err)
}

// Link the interface to a VRF.
Expand All @@ -1008,15 +1008,15 @@ func (ri *routerInterface) RemoveRouterInterface(ctx context.Context, req *saipb
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_INPUT_IFACE).WithUint64(req.GetOid()))),
).Build())
if err != nil {
return nil, err
slog.WarnContext(ctx, "failed to remove IngressVRFTable entry for RouterInterface", "err", err)
}

// Give the interface a SMAC.
_, err = ri.dataplane.TableEntryRemove(ctx, fwdconfig.TableEntryRemoveRequest(ri.dataplane.ID(), SRCMACTable).AppendEntry(
fwdconfig.EntryDesc(fwdconfig.ExactEntry(fwdconfig.PacketFieldBytes(fwdpb.PacketFieldNum_PACKET_FIELD_NUM_OUTPUT_IFACE).WithUint64(req.GetOid()))),
).Build())
if err != nil {
return nil, err
slog.WarnContext(ctx, "failed to remove SRCMACTable entry for RouterInterface", "err", err)
}

return &saipb.RemoveRouterInterfaceResponse{}, nil
Expand Down
Loading