Record origin changes and show them on the prefix page (closes #161)
check / check (push) Successful in 4m6s
check / check (push) Successful in 4m6s
The routing table records each prefix and origin AS pair's origin changes: when it gains its first peer and when it loses its last. Each row holds the prefix, the origin AS, announced or withdrawn, the peer count and the time. The prefix handler writes them to a new origin_changes table, and the database maintainer prunes each prefix to its newest 500 rows and 72 hours. The prefix page lists them newest first, at most 5,000. Model: deepseek-v4-pro
This commit is contained in:
@@ -55,6 +55,14 @@ type Store interface {
|
||||
WriteRouteChanges(changes []routetable.Change, newPeers map[string]uint) error
|
||||
ReadRouteTable(ctx context.Context) (*routetable.Table, error)
|
||||
|
||||
// Origin change operations: the prefix and origin AS pairs' first and
|
||||
// last peers, as the routing table records them.
|
||||
WriteOriginChanges(changes []routetable.OriginChange) error
|
||||
GetOriginChanges(
|
||||
ctx context.Context, prefix netip.Prefix, limit int,
|
||||
) ([]routetable.OriginChange, error)
|
||||
PruneOriginChanges(ctx context.Context) error
|
||||
|
||||
// ASN WHOIS operations
|
||||
GetNextStaleASN(ctx context.Context, staleThreshold time.Duration) (int, error)
|
||||
UpdateASNWHOIS(ctx context.Context, update *ASNWHOISUpdate) error
|
||||
|
||||
@@ -0,0 +1,172 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/netip"
|
||||
"time"
|
||||
|
||||
"git.eeqj.de/sneak/routewatch/internal/routetable"
|
||||
)
|
||||
|
||||
// maxOriginChangesPerPrefix is how many origin changes the prune keeps for
|
||||
// each prefix: the newest ones. A prefix with more has its older rows deleted.
|
||||
const maxOriginChangesPerPrefix = 500
|
||||
|
||||
// originChangesRetention is how long the prune keeps an origin change: rows
|
||||
// older than this are deleted, unless they are among the prefix's newest
|
||||
// maxOriginChangesPerPrefix.
|
||||
const originChangesRetention = 72 * time.Hour
|
||||
|
||||
// The statements of the origin_changes table (schema.sql).
|
||||
const (
|
||||
insertOriginChangeSQL = `INSERT INTO origin_changes
|
||||
(prefix, origin_asn, announced, peer_count, time)
|
||||
VALUES (?, ?, ?, ?, ?)`
|
||||
originChangesSQL = `SELECT prefix, origin_asn, announced, peer_count, time
|
||||
FROM origin_changes WHERE prefix = ? ORDER BY id DESC LIMIT ?`
|
||||
prunePrefixesSQL = `SELECT prefix FROM origin_changes
|
||||
GROUP BY prefix HAVING COUNT(*) > ?`
|
||||
pruneOriginChangesSQL = `DELETE FROM origin_changes
|
||||
WHERE prefix = ? AND time < ? AND id < (
|
||||
SELECT id FROM origin_changes WHERE prefix = ?
|
||||
ORDER BY id DESC LIMIT 1 OFFSET ?)`
|
||||
)
|
||||
|
||||
// WriteOriginChanges writes, in one transaction, the origin changes the
|
||||
// routing table handed over. When it fails, it writes nothing; the caller then
|
||||
// writes them again.
|
||||
func (d *Database) WriteOriginChanges(changes []routetable.OriginChange) error {
|
||||
if len(changes) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
d.lock("WriteOriginChanges")
|
||||
defer d.unlock()
|
||||
|
||||
tx, err := d.beginTx()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to begin transaction: %w", err)
|
||||
}
|
||||
defer d.rollback(tx)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
stmt, err := tx.PrepareContext(ctx, insertOriginChangeSQL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to prepare origin change insert: %w", err)
|
||||
}
|
||||
defer func() { _ = stmt.Close() }()
|
||||
|
||||
for _, change := range changes {
|
||||
_, err := stmt.ExecContext(ctx, change.Prefix.String(),
|
||||
change.OriginASN, change.Announced, change.PeerCount,
|
||||
change.Time.Unix())
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to write origin change %s: %w",
|
||||
change.Prefix, err)
|
||||
}
|
||||
}
|
||||
|
||||
err = tx.Commit()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to commit transaction: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetOriginChanges returns at most limit of prefix's origin changes, newest
|
||||
// first.
|
||||
func (d *Database) GetOriginChanges(
|
||||
ctx context.Context, prefix netip.Prefix, limit int,
|
||||
) ([]routetable.OriginChange, error) {
|
||||
rows, err := d.db.QueryContext(ctx, originChangesSQL,
|
||||
prefix.Masked().String(), limit)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read origin changes: %w", err)
|
||||
}
|
||||
defer func() { _ = rows.Close() }()
|
||||
|
||||
var changes []routetable.OriginChange
|
||||
|
||||
for rows.Next() {
|
||||
var (
|
||||
change routetable.OriginChange
|
||||
prefixText string
|
||||
timeSec int64
|
||||
)
|
||||
|
||||
err := rows.Scan(&prefixText, &change.OriginASN, &change.Announced,
|
||||
&change.PeerCount, &timeSec)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read an origin change: %w", err)
|
||||
}
|
||||
|
||||
change.Prefix, err = netip.ParsePrefix(prefixText)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read origin change %s: %w",
|
||||
prefixText, err)
|
||||
}
|
||||
|
||||
change.Time = time.Unix(timeSec, 0).UTC()
|
||||
changes = append(changes, change)
|
||||
}
|
||||
|
||||
err = rows.Err()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read origin changes: %w", err)
|
||||
}
|
||||
|
||||
return changes, nil
|
||||
}
|
||||
|
||||
// PruneOriginChanges deletes, for each prefix with more than
|
||||
// maxOriginChangesPerPrefix rows, the rows older than originChangesRetention
|
||||
// that are not among its newest maxOriginChangesPerPrefix. It finds those
|
||||
// prefixes on a reading connection and deletes one prefix per write, so no
|
||||
// write holds the lock for long.
|
||||
func (d *Database) PruneOriginChanges(ctx context.Context) error {
|
||||
rows, err := d.db.QueryContext(ctx, prunePrefixesSQL,
|
||||
maxOriginChangesPerPrefix)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to find prefixes to prune: %w", err)
|
||||
}
|
||||
defer func() { _ = rows.Close() }()
|
||||
|
||||
var prefixes []string
|
||||
|
||||
for rows.Next() {
|
||||
var prefix string
|
||||
|
||||
err := rows.Scan(&prefix)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read a prefix to prune: %w", err)
|
||||
}
|
||||
|
||||
prefixes = append(prefixes, prefix)
|
||||
}
|
||||
|
||||
err = rows.Err()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to find prefixes to prune: %w", err)
|
||||
}
|
||||
|
||||
cutoff := time.Now().Add(-originChangesRetention).Unix()
|
||||
|
||||
for _, prefix := range prefixes {
|
||||
d.lock("PruneOriginChanges")
|
||||
|
||||
_, err := d.writer.ExecContext(ctx, pruneOriginChangesSQL,
|
||||
prefix, cutoff, prefix, maxOriginChangesPerPrefix-1)
|
||||
|
||||
d.unlock()
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to prune origin changes of %s: %w",
|
||||
prefix, err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,160 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"net/netip"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.eeqj.de/sneak/routewatch/internal/routetable"
|
||||
)
|
||||
|
||||
// TestOriginChangesWriteThenRead writes three origin changes and reads them
|
||||
// back newest first, honouring the limit.
|
||||
func TestOriginChangesWriteThenRead(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db := newRoutesTestDatabase(t)
|
||||
prefix := netip.MustParsePrefix(tablePrefixV4)
|
||||
|
||||
changes := []routetable.OriginChange{
|
||||
{Prefix: prefix, OriginASN: asA, Announced: true, PeerCount: 1,
|
||||
Time: tableTime(10)},
|
||||
{Prefix: prefix, OriginASN: asA, Announced: false, PeerCount: 0,
|
||||
Time: tableTime(20)},
|
||||
{Prefix: prefix, OriginASN: asB, Announced: true, PeerCount: 1,
|
||||
Time: tableTime(30)},
|
||||
}
|
||||
|
||||
err := db.WriteOriginChanges(changes)
|
||||
if err != nil {
|
||||
t.Fatalf("WriteOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
got, err := db.GetOriginChanges(t.Context(), prefix, 2)
|
||||
if err != nil {
|
||||
t.Fatalf("GetOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
want := []routetable.OriginChange{
|
||||
{Prefix: prefix, OriginASN: asB, Announced: true, PeerCount: 1,
|
||||
Time: tableTime(30)},
|
||||
{Prefix: prefix, OriginASN: asA, Announced: false, PeerCount: 0,
|
||||
Time: tableTime(20)},
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(got, want) {
|
||||
t.Errorf("GetOriginChanges = %+v, want %+v", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
// TestOriginChangesPrune checks that the prune keeps every row newer than 72
|
||||
// hours, keeps the newest 500 rows of each prefix, deletes the rest, and
|
||||
// leaves other prefixes alone.
|
||||
func TestOriginChangesPrune(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db := newRoutesTestDatabase(t)
|
||||
oldPrefix := netip.MustParsePrefix(tablePrefixV4)
|
||||
newPrefix := netip.MustParsePrefix(tablePrefixShortV4)
|
||||
other := netip.MustParsePrefix("10.20.0.0/16")
|
||||
|
||||
now := time.Now()
|
||||
|
||||
changes := make([]routetable.OriginChange, 0, 1201)
|
||||
|
||||
// 600 rows for oldPrefix, all older than 72 hours, oldest first. The
|
||||
// prune keeps the newest 500 and deletes the oldest 100.
|
||||
for i := range 600 {
|
||||
changes = append(changes, routetable.OriginChange{
|
||||
Prefix: oldPrefix, OriginASN: asA, Announced: true, PeerCount: 1,
|
||||
Time: now.Add(-100 * time.Hour).Add(time.Duration(i) * time.Minute),
|
||||
})
|
||||
}
|
||||
|
||||
// 600 rows for newPrefix, all newer than 72 hours, oldest first. The
|
||||
// prune keeps all of them.
|
||||
for i := range 600 {
|
||||
changes = append(changes, routetable.OriginChange{
|
||||
Prefix: newPrefix, OriginASN: asA, Announced: true, PeerCount: 1,
|
||||
Time: now.Add(-71 * time.Hour).Add(time.Duration(i) * time.Minute),
|
||||
})
|
||||
}
|
||||
|
||||
// One row for other, which the prune leaves alone.
|
||||
changes = append(changes, routetable.OriginChange{
|
||||
Prefix: other, OriginASN: asA, Announced: true, PeerCount: 1,
|
||||
Time: now.Add(-100 * time.Hour),
|
||||
})
|
||||
|
||||
err := db.WriteOriginChanges(changes)
|
||||
if err != nil {
|
||||
t.Fatalf("WriteOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
err = db.PruneOriginChanges(t.Context())
|
||||
if err != nil {
|
||||
t.Fatalf("PruneOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
gotOld, err := db.GetOriginChanges(t.Context(), oldPrefix, 1000)
|
||||
if err != nil {
|
||||
t.Fatalf("GetOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
if len(gotOld) != 500 {
|
||||
t.Errorf("GetOriginChanges(oldPrefix) = %d rows, want 500", len(gotOld))
|
||||
}
|
||||
|
||||
gotNew, err := db.GetOriginChanges(t.Context(), newPrefix, 1000)
|
||||
if err != nil {
|
||||
t.Fatalf("GetOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
if len(gotNew) != 600 {
|
||||
t.Errorf("GetOriginChanges(newPrefix) = %d rows, want 600", len(gotNew))
|
||||
}
|
||||
|
||||
gotOther, err := db.GetOriginChanges(t.Context(), other, 10)
|
||||
if err != nil {
|
||||
t.Fatalf("GetOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
if len(gotOther) != 1 {
|
||||
t.Errorf("GetOriginChanges(other) = %d rows, want 1", len(gotOther))
|
||||
}
|
||||
}
|
||||
|
||||
// TestOriginChangesSurviveRouteDeletion checks that deleting a routes row
|
||||
// leaves the prefix's origin_changes rows.
|
||||
func TestOriginChangesSurviveRouteDeletion(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db := newRoutesTestDatabase(t)
|
||||
prefix := netip.MustParsePrefix(tablePrefixV4)
|
||||
|
||||
err := db.WriteOriginChanges([]routetable.OriginChange{{
|
||||
Prefix: prefix, OriginASN: asA, Announced: true, PeerCount: 1,
|
||||
Time: tableTime(10),
|
||||
}})
|
||||
if err != nil {
|
||||
t.Fatalf("WriteOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
// Write a route, then delete it.
|
||||
table := routetable.New(routetable.Params{})
|
||||
announceTo(table, tablePrefixV4, asA, peerA, 10)
|
||||
writeTableChanges(t, db, table)
|
||||
|
||||
table.Withdraw(prefix, peerA)
|
||||
writeTableChanges(t, db, table)
|
||||
|
||||
got, err := db.GetOriginChanges(t.Context(), prefix, 10)
|
||||
if err != nil {
|
||||
t.Fatalf("GetOriginChanges: %v", err)
|
||||
}
|
||||
|
||||
if len(got) != 1 {
|
||||
t.Errorf("GetOriginChanges = %d rows, want 1", len(got))
|
||||
}
|
||||
}
|
||||
@@ -119,4 +119,19 @@ CREATE TABLE IF NOT EXISTS routes (
|
||||
CREATE TABLE IF NOT EXISTS route_peers (
|
||||
number INTEGER PRIMARY KEY,
|
||||
address TEXT NOT NULL UNIQUE
|
||||
);
|
||||
);
|
||||
|
||||
-- The origin changes of the routing table: each time a prefix and origin AS
|
||||
-- gained its first peer or lost its last. The prefix handler writes them, and
|
||||
-- the database maintainer prunes each prefix to its newest 500 rows and 72
|
||||
-- hours. time is whole seconds since 1970, UTC.
|
||||
CREATE TABLE IF NOT EXISTS origin_changes (
|
||||
id INTEGER PRIMARY KEY,
|
||||
prefix TEXT NOT NULL,
|
||||
origin_asn INTEGER NOT NULL,
|
||||
announced BOOLEAN NOT NULL,
|
||||
peer_count INTEGER NOT NULL,
|
||||
time INTEGER NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_origin_changes_prefix ON origin_changes(prefix);
|
||||
Reference in New Issue
Block a user