Skip to content

Commit

Permalink
fix: bug with FABRID detached hops + add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeltevanbommel
jeltevanbommel committed Jan 8, 2025
1 parent 24b0cd3 commit 035ae7f
Show file tree
Hide file tree
Showing 6 changed files with 747 additions and 60 deletions.
17 changes: 16 additions & 1 deletion daemon/internal/servers/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools/lint:go.bzl", "go_library")
load("//tools/lint:go.bzl", "go_library", "go_test")

go_library(
name = "go_default_library",
Expand Down Expand Up @@ -40,3 +40,18 @@ go_library(
"@org_golang_x_sync//singleflight:go_default_library",
],
)

go_test(
name = "go_default_test",
srcs = ["grpc_fabrid_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/private/xtest:go_default_library",
"//pkg/proto/control_plane/experimental:go_default_library",
"//pkg/proto/control_plane/experimental/mock_experimental:go_default_library",
"//pkg/snet:go_default_library",
"//pkg/snet/path:go_default_library",
"@com_github_golang_mock//gomock:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
],
)
6 changes: 1 addition & 5 deletions daemon/internal/servers/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ func (s *DaemonServer) paths(ctx context.Context,
return nil, err
}
if req.FetchFabridDetachedMaps {
detachedHops := findDetachedHops(paths)
if len(detachedHops) > 0 {
log.Info("Detached hops found", "hops", len(detachedHops))
updateFabridInfo(ctx, s.Dialer, detachedHops)
}
s.fetchFabridDetachedMaps(ctx, paths, nil)
}
reply := &sdpb.PathsResponse{}
for _, p := range paths {
Expand Down
135 changes: 81 additions & 54 deletions daemon/internal/servers/grpc_fabrid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,86 +24,113 @@ import (
"github.com/scionproto/scion/pkg/drkey"
"github.com/scionproto/scion/pkg/experimental/fabrid"
fabrid_utils "github.com/scionproto/scion/pkg/experimental/fabrid/graphutils"
libgrpc "github.com/scionproto/scion/pkg/grpc"
"github.com/scionproto/scion/pkg/log"
"github.com/scionproto/scion/pkg/private/serrors"
"github.com/scionproto/scion/pkg/proto/control_plane/experimental"
sdpb "github.com/scionproto/scion/pkg/proto/daemon"
fabrid_ext "github.com/scionproto/scion/pkg/segment/extensions/fabrid"
"github.com/scionproto/scion/pkg/snet"
snetpath "github.com/scionproto/scion/pkg/snet/path"
)

type tempHopInfo struct {
IA addr.IA
Meta *snet.PathMetadata
Digest []byte
fiIdx int
Ingress uint16
Egress uint16
}

// updateFabridInfo updates the FABRID info that is contained in the path Metadata for detached
// hops, by fetching the corresponding FABRID maps from the corresponding AS.
func updateFabridInfo(ctx context.Context, dialer libgrpc.Dialer, detachedHops []tempHopInfo) {
conn, err := dialer.Dial(ctx, &snet.SVCAddr{SVC: addr.SvcCS})
if err != nil {
log.FromCtx(ctx).Debug("Dialing CS failed", "err", err)
}
defer conn.Close()
client := experimental.NewFABRIDIntraServiceClient(conn)
fabridMaps := make(map[addr.IA]fabrid_utils.FabridMapEntry)
for _, detachedHop := range detachedHops {
if _, ok := fabridMaps[detachedHop.IA]; !ok {
fabridMaps[detachedHop.IA] = fetchMaps(ctx, detachedHop.IA, client,
detachedHop.Meta.FabridInfo[detachedHop.fiIdx].Digest)
// fetchFabridDetachedMaps uses findDetachedHops to find the detached hops in a path, for a given
// list of paths. The detached map is then fetched with fetchMaps and the path in the list of paths
// is updated. Parameter client may be nil.
func (s *DaemonServer) fetchFabridDetachedMaps(ctx context.Context, paths []snet.Path,
client experimental.FABRIDIntraServiceClient) {
fetchedMaps := make(map[addr.IA]fabrid_utils.FabridMapEntry)
// Check for each path whether they have hops that have a detached map
for i := 0; i < len(paths); i++ {
pMeta := paths[i].Metadata()
hops := findDetachedHops(pMeta)
if len(hops) == 0 {
continue
}
// There are detached hops, which means we need to update the path's metadata,
// create a copy.
newPath := snetpath.Path{
Src: paths[i].Source(),
Dst: paths[i].Destination(),
DataplanePath: paths[i].Dataplane(),
NextHop: paths[i].UnderlayNextHop(),
Meta: *paths[i].Metadata(),
}
// We need to fetch the detached hops, check if there is already a connection to the CS.
if client == nil {
conn, err := s.Dialer.Dial(ctx, &snet.SVCAddr{SVC: addr.SvcCS})
if err != nil {
log.FromCtx(ctx).Debug("Dialing CS failed", "err", err)
continue
}
defer conn.Close()
client = experimental.NewFABRIDIntraServiceClient(conn)
}
detachedHop.Meta.FabridInfo[detachedHop.fiIdx] = *fabrid_utils.
GetFabridInfoForIntfs(detachedHop.IA, detachedHop.Ingress, detachedHop.Egress,
fabridMaps, true)
// Fetch the FABRID maps for this AS and update the metadata
for _, h := range hops {
// Only fetch if not previously fetched
if _, exist := fetchedMaps[h.IA]; !exist {
fetchedMaps[h.IA] = fetchMaps(ctx, h.IA, client, h.Digest)
}
// With the fetched map get an updated FABRID Info for this detached hop.
newFi := *fabrid_utils.GetFabridInfoForIntfs(h.IA, h.Ingress, h.Egress, fetchedMaps,
true)
// Update the metadata
newPath.Meta.FabridInfo[h.fiIdx] = newFi
}
// Update the path
paths[i] = newPath
}
}

// findDetachedHops finds the hops where the FABRID maps have been detached in a given list of
// paths.
func findDetachedHops(paths []snet.Path) []tempHopInfo {
func findDetachedHops(meta *snet.PathMetadata) []tempHopInfo {
detachedHops := make([]tempHopInfo, 0)
for _, p := range paths {
// If the source AS does not support FABRID, the FABRID Info array will be empty.
if len(p.Metadata().FabridInfo) == 0 || len(p.Metadata().FabridInfo) != len(p.Metadata().
Interfaces)/2+1 {
continue
}
if p.Metadata().FabridInfo[0].Enabled && p.Metadata().FabridInfo[0].Detached {
detachedHops = append(detachedHops, tempHopInfo{
IA: p.Metadata().Interfaces[0].IA,
Meta: p.Metadata(),
fiIdx: 0,
Ingress: 0,
Egress: uint16(p.Metadata().Interfaces[0].ID),
})
}
for i := 1; i < len(p.Metadata().Interfaces)-1; i += 2 {
if p.Metadata().FabridInfo[(i+1)/2].Enabled &&
p.Metadata().FabridInfo[(i+1)/2].Detached {
detachedHops = append(detachedHops, tempHopInfo{
IA: p.Metadata().Interfaces[i].IA,
Meta: p.Metadata(),
fiIdx: (i + 1) / 2,
Ingress: uint16(p.Metadata().Interfaces[i].ID),
Egress: uint16(p.Metadata().Interfaces[i+1].ID),
})
}
}
if p.Metadata().FabridInfo[len(p.Metadata().Interfaces)/2].Enabled &&
p.Metadata().FabridInfo[len(p.Metadata().Interfaces)/2].Detached {
log.Info("findDetachedHops")
// If the source AS does not support FABRID, the FABRID Info array will be empty.
if len(meta.FabridInfo) == 0 || len(meta.FabridInfo) != len(meta.Interfaces)/2+1 {
log.Info("source AS does not support FABRID")
return detachedHops
}
if meta.FabridInfo[0].Enabled && meta.FabridInfo[0].Detached {
detachedHops = append(detachedHops, tempHopInfo{
IA: meta.Interfaces[0].IA,
Digest: meta.FabridInfo[0].Digest,
fiIdx: 0,
Ingress: 0,
Egress: uint16(meta.Interfaces[0].ID),
})
}
for i := 1; i < len(meta.Interfaces)-1; i += 2 {
if meta.FabridInfo[(i+1)/2].Enabled &&
meta.FabridInfo[(i+1)/2].Detached {
detachedHops = append(detachedHops, tempHopInfo{
IA: p.Metadata().Interfaces[len(p.Metadata().Interfaces)-1].IA,
Meta: p.Metadata(),
fiIdx: len(p.Metadata().Interfaces) / 2,
Ingress: uint16(p.Metadata().Interfaces[len(p.Metadata().Interfaces)-1].ID),
Egress: 0,
IA: meta.Interfaces[i].IA,
Digest: meta.FabridInfo[(i+1)/2].Digest,
fiIdx: (i + 1) / 2,
Ingress: uint16(meta.Interfaces[i].ID),
Egress: uint16(meta.Interfaces[i+1].ID),
})
}
}
if meta.FabridInfo[len(meta.Interfaces)/2].Enabled &&
meta.FabridInfo[len(meta.Interfaces)/2].Detached {
detachedHops = append(detachedHops, tempHopInfo{
IA: meta.Interfaces[len(meta.Interfaces)-1].IA,
Digest: meta.FabridInfo[len(meta.Interfaces)/2].Digest,
fiIdx: len(meta.Interfaces) / 2,
Ingress: uint16(meta.Interfaces[len(meta.Interfaces)-1].ID),
Egress: 0,
})
}
return detachedHops
}

Expand Down
Loading

0 comments on commit 035ae7f

Please sign in to comment.