-
Notifications
You must be signed in to change notification settings - Fork 162
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pkg/snet: change snet.Topology to a struct (#4673)
Instead of having the snet.Topology as an interface, change it to a struct. This makes the contract clearer, LocalIA and PortRange are only considered when creating a connection. The Interface information however can dynamically change. The daemon API now exposes an adapter to load the topology information once or to load the information periodically.
- Loading branch information
1 parent
efbbd58
commit 05dfe81
Showing
14 changed files
with
390 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| // Copyright 2024 Anapaya Systems | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package daemon | ||
|
|
||
| import ( | ||
| "context" | ||
| "net/netip" | ||
| "sync/atomic" | ||
| "time" | ||
|
|
||
| "github.com/scionproto/scion/pkg/log" | ||
| "github.com/scionproto/scion/pkg/private/serrors" | ||
| "github.com/scionproto/scion/pkg/snet" | ||
| ) | ||
|
|
||
| // LoadTopology loads the local topology from the given connector. The topology | ||
| // information is loaded once and does not update automatically. | ||
| func LoadTopology(ctx context.Context, conn Connector) (snet.Topology, error) { | ||
| ia, err := conn.LocalIA(ctx) | ||
| if err != nil { | ||
| return snet.Topology{}, serrors.Wrap("loading local ISD-AS", err) | ||
| } | ||
| start, end, err := conn.PortRange(ctx) | ||
| if err != nil { | ||
| return snet.Topology{}, serrors.Wrap("loading port range", err) | ||
| } | ||
| interfaces, err := conn.Interfaces(ctx) | ||
| if err != nil { | ||
| return snet.Topology{}, serrors.Wrap("loading interfaces", err) | ||
| } | ||
|
|
||
| return snet.Topology{ | ||
| LocalIA: ia, | ||
| PortRange: snet.TopologyPortRange{ | ||
| Start: start, | ||
| End: end, | ||
| }, | ||
| Interface: func(ifID uint16) (netip.AddrPort, bool) { | ||
| a, ok := interfaces[ifID] | ||
| return a, ok | ||
| }, | ||
| }, nil | ||
| } | ||
|
|
||
| // ReloadingTopology is a topology that reloads the interface information | ||
| // periodically. It is safe for concurrent use. | ||
| type ReloadingTopology struct { | ||
| conn Connector | ||
| baseTopology snet.Topology | ||
| interfaces atomic.Pointer[map[uint16]netip.AddrPort] | ||
| } | ||
|
|
||
| // NewReloadingTopology creates a new ReloadingTopology that reloads the | ||
| // interface information periodically. The Run method must be called for | ||
| // interface information to be populated. | ||
| func NewReloadingTopology(ctx context.Context, conn Connector) (*ReloadingTopology, error) { | ||
| ia, err := conn.LocalIA(ctx) | ||
| if err != nil { | ||
| return nil, serrors.Wrap("loading local ISD-AS", err) | ||
| } | ||
| start, end, err := conn.PortRange(ctx) | ||
| if err != nil { | ||
| return nil, serrors.Wrap("loading port range", err) | ||
| } | ||
| t := &ReloadingTopology{ | ||
| conn: conn, | ||
| baseTopology: snet.Topology{ | ||
| LocalIA: ia, | ||
| PortRange: snet.TopologyPortRange{Start: start, End: end}, | ||
| }, | ||
| } | ||
| if err := t.loadInterfaces(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return t, nil | ||
| } | ||
|
|
||
| func (t *ReloadingTopology) Topology() snet.Topology { | ||
| base := t.baseTopology | ||
| return snet.Topology{ | ||
| LocalIA: base.LocalIA, | ||
| PortRange: base.PortRange, | ||
| Interface: func(ifID uint16) (netip.AddrPort, bool) { | ||
| m := t.interfaces.Load() | ||
| if m == nil { | ||
| return netip.AddrPort{}, false | ||
| } | ||
| a, ok := (*m)[ifID] | ||
| return a, ok | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (t *ReloadingTopology) Run(ctx context.Context, period time.Duration) { | ||
| ticker := time.NewTicker(period) | ||
| defer ticker.Stop() | ||
|
|
||
| reload := func() { | ||
| ctx, cancel := context.WithTimeout(ctx, time.Second) | ||
| defer cancel() | ||
| if err := t.loadInterfaces(ctx); err != nil { | ||
| log.FromCtx(ctx).Error("Failed to reload interfaces", "err", err) | ||
| } | ||
| } | ||
| reload() | ||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return | ||
| case <-ticker.C: | ||
| reload() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (t *ReloadingTopology) loadInterfaces(ctx context.Context) error { | ||
| intfs, err := t.conn.Interfaces(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| t.interfaces.Store(&intfs) | ||
| return nil | ||
| } |
Oops, something went wrong.