Skip to content

Agent Mesh

controlplane: hand the routers out in one order

Antonio Ojea63a63d28d06b
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index 836f0efd..27944418 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -976,9 +976,11 @@ func (s *SQLStore) UpsertRouterLease(ctx context.Context, lease *RouterLease) er
return err
}
-// GetActiveRouters implements Store.
+// GetActiveRouters implements Store. The order is by peer ID, so every
+// member handed the list picks the same first router to reserve a relay on
+// and a caller finds a peer's reservation where it looks first.
func (s *SQLStore) GetActiveRouters(ctx context.Context) ([]RouterLease, error) {
- query := s.rebind(`SELECT peer_id, multiaddresses, last_lease_renewal, expires_at, connected_peers, dht_size FROM routers WHERE expires_at > ?`)
+ query := s.rebind(`SELECT peer_id, multiaddresses, last_lease_renewal, expires_at, connected_peers, dht_size FROM routers WHERE expires_at > ? ORDER BY peer_id`)
rows, err := s.db.QueryContext(ctx, query, time.Now().UnixMilli())
if err != nil {
return nil, err
diff --git a/internal/storage/sql_store_test.go b/internal/storage/sql_store_test.go
index 7471c0e9..0f83635f 100644
--- a/internal/storage/sql_store_test.go
+++ b/internal/storage/sql_store_test.go
@@ -481,6 +481,31 @@ func TestRouterLeaseOps(t *testing.T) {
if len(routers) != 1 {
t.Fatalf("expected 1 router, got %d", len(routers))
}
+
+ // More routers come back in one order, by peer ID, whatever the order
+ // they leased in: members reserve on the first and callers try them in
+ // turn, so both sides must see the same list.
+ for _, id := range []string{"12D3KooWZzzLastRouter", "12D3KooWAaaFirstRouter"} {
+ if err := store.UpsertRouterLease(ctx, &RouterLease{
+ PeerID: id,
+ Addresses: []string{"/ip4/127.0.0.1/tcp/5003/p2p/" + id},
+ LastRenewal: time.Now(),
+ ExpiresAt: time.Now().Add(10 * time.Second),
+ }); err != nil {
+ t.Fatalf("failed to upsert router lease %s: %v", id, err)
+ }
+ }
+ routers, err = store.GetActiveRouters(ctx)
+ if err != nil {
+ t.Fatalf("failed to get active routers: %v", err)
+ }
+ var got []string
+ for _, r := range routers {
+ got = append(got, r.PeerID)
+ }
+ if want := []string{"12D3KooWAaaFirstRouter", peerID, "12D3KooWZzzLastRouter"}; !reflect.DeepEqual(got, want) {
+ t.Fatalf("active routers %v, want them ordered by peer ID %v", got, want)
+ }
}
func TestPolicyOps(t *testing.T) {