Make the routewatch tests pass on a loaded host (closes #213 )

Five prefix handler tests gave HandleMessage two seconds to apply a full batch of 25,000 prefixes, which under the race detector on a loaded host takes longer. A test now waits up to stepTimeout, 15 seconds, for each step it expects. The slowest tests filled production limits, such as the peering handler's 500,000 paths. The peering handler now takes its path limit, and the prefix handler its limit on one write of the table's changes, as they take their timer interval. Those tests give small limits, and the tests of the maximum batch size lower it to one batch. This also fixes #215. The test helpers bound every wait, Stop included, so a test that hangs in one fails with its own message. Model: opus-5-5
2026-10-28 00:06:53 +00:00
17 changed files with 260 additions and 1247 deletions
@@ -429,12 +429,10 @@ the routing table, and everything else from the database.
    - Parses BGP UPDATE messages from JSON stream
    - Dispatches to registered handlers based on message type
    - Each handler has its own queue with backpressure handling
-    - Handlers batch writes for efficiency. The AS, peer and prefix handlers
+    - Handlers batch writes for efficiency: the AS, peer and prefix handlers
-      write a batch when it reaches a size, or after a time:
+      write 30,000, 10,000 and 25,000 updates at a time, or after 2, 2 and 1
-        - the AS handler at 30,000 ASes, or after 2 seconds;
+      seconds; the peering handler writes the peerings it has collected every 30
-        - the peer handler at 10,000 updates, or after 2 seconds;
+      seconds
        - the prefix handler at 25,000 updates, or after 1 second.
    - The peering handler writes the peerings it has collected every 30 seconds
 4. **Handler Details**
    - **ASHandler**: Tracks all ASNs seen in AS paths
@@ -444,9 +442,7 @@ the routing table, and everything else from the database.
        - An announcement gives the peer a route to the prefix.
        - A withdrawal removes the peer's route. So does an announcement whose
          AS path is empty or holds AS 0 anywhere.
-        - A peer whose BGP session goes down leaves every prefix. The handler
+        - A peer whose BGP session goes down leaves every prefix.
          holds back the peer's later updates until the peer has left every
          prefix, then applies them in order.
        Every second it writes the changed prefix and origin AS pairs to the
        `routes` table. A write takes at most 20,000 pairs, and the rest follow
@@ -582,8 +578,8 @@ Budget:
 - Go heap: a 2.5 GiB soft limit (`GOMEMLIMIT=2560MiB`, set in the image).
    - The routing table takes about 700 bytes per prefix and origin AS. A full
      table has about 1.4 million of these pairs, so it takes about 1 GB.
-    - The rest of the heap takes up to about 0.5 GiB. Most of it is what the
+    - The rest of the heap takes up to about 0.5 GiB. Most of it is the
-      handlers hold, described below.
+      handlers' batches and queues, described below.
    - The remaining 1 GiB is room for the garbage collector. With much less, it
      would run almost all the time.
 - SQLite: 656 MiB of page cache.
@@ -636,25 +632,16 @@ What happens at each limit:
  `STATE` message, which it holds, in feed order, until there is room: a few
  hundred bytes each, about ten a second.
 - Handler batches: while the AS, peer or prefix handler writes a batch to the
-  database, the updates that arrive collect in its next batch.
+  database, the updates that arrive collect in its next batch. That batch stops
-    - The AS handler's batch holds one entry per AS, with the earliest and the
+  at ten times the batch size:
-      latest time of its updates. About 80,000 ASes appear in the feed, so the
+    - 300,000 updates for the AS handler (`asnBatchMaxSize`, about 10 MiB);
-      batch takes at most about 10 MiB, however fast the feed runs.
+    - 100,000 for the peer handler (`peerBatchMaxSize`, about 10 MiB);
-    - The peer handler's batch stops at 100,000 updates (`peerBatchMaxSize`),
+    - 250,000 for the prefix handler (`prefixBatchMaxSize`, about 15 MiB).
      about 10 MiB.
    - The prefix handler's batch stops at 250,000 updates
      (`prefixBatchMaxSize`), about 15 MiB.
-    At that maximum the peer or prefix handler takes nothing more off its queue
+    At that size the handler takes nothing more off its queue until the write
-    until the write ends. The queue then fills, and the streamer drops messages
+    ends. The queue then fills, and the streamer drops messages as above. With
-    as above. With the batches being written, the three handlers' batches take
+    the batches being written, the three handlers' batches take at most about
-    at most about 0.1 GiB of the Go heap.
+    0.1 GiB of the Go heap.
 - Held-back messages: the prefix handler holds back a peer's messages after the
  peer's session goes down. It applies them once the peer has left every prefix.
  It holds at most 20,000 such messages (`maxHeldBackMessages`), about 20 MiB.
  At that number it takes nothing more off its queue until it has applied one of
  them.
 With `DEBUG=routewatch` the daemon logs a `System stats` line every 60 seconds
 with the goroutine count and Go memory figures.
@@ -35,40 +35,6 @@ tested.
 # Completed Steps
 - 2026-11-02: working out the home page's cards no longer stops the prefix
  handler. The walk over the routing table holds the table's lock for 10,000
  prefixes at a time, then lets the lock go for as long again, as `PeerDown`
  does. It used to take the lock back at once. The prefix handler then applied
  about one update per 10,000 prefixes walked. During a walk, its queue could
  fill, and the streamer then dropped updates for it (closes #226)
 - 2026-11-02: like a failed WHOIS lookup, a lookup skipped because its RIR is
  paused makes the fetcher wait longer before the next lookup. The longest wait
  is one minute. The status page does not count a skip as a failure. A skip used
  to leave the wait as it was. Each lookup asks IANA before it finds its RIR
  paused. So while most stale ASes belonged to a paused RIR, the fetcher could
  ask IANA every second (closes #222)
 - 2026-11-02: a peer's session going down no longer stops the prefix handler.
  The handler runs the table's `PeerDown` on a separate goroutine, one peer at a
  time, and goes on taking messages. `PeerDown` holds the table's lock for
  10,000 prefixes at a time, then lets the lock go for as long again. The
  handler holds back the down peer's later messages until that peer's `PeerDown`
  returns. Then the handler applies them in order, one at a time, and takes new
  messages in between. It holds back at most 20,000 messages. At that number,
  `HandleMessage` waits until one of them is applied. When `Stop` runs past its
  deadline, it logs how many held-back messages were not applied (closes #216)
 - 2026-11-02: RouteWatch pauses an RIR's or NIC.br's WHOIS server for an hour
  after the server refuses a query. A refused or reset connection is a refusal.
  So is an answer with an `%ERROR:201:` or `%ERROR:202:` line. Lookups at the
  other servers go on. An AS whose RIR is paused is looked up after the pause.
  IANA is never paused, because a pause of IANA would stop every lookup. A
  refusal by IANA is an ordinary failure. NIC.br is also paused for an hour
  after it says RouteWatch has passed NIC.br's query limit. Before, the fetcher
  asked a server again within seconds of a refusal (closes #218)
 - 2026-11-02: the AS handler never waits for a database write. Its batch holds
  one entry per AS, with the earliest and the latest time of its updates. So the
  batch no longer grows with the feed's rate. It used to hold one entry for each
  AS of each path and to wait once it held 300,000. In a burst of the feed its
  queue then filled, and the streamer dropped messages for it (closes #217)
 - 2026-10-27: the tests of `internal/routewatch` no longer fail on a loaded
  host. Five of them gave `HandleMessage` two seconds to apply a full prefix
  batch, which under the race detector can take longer. A test now waits up to
@@ -10,6 +10,10 @@ import (
 	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 )
 // walkBatch is how many prefixes the walk over the whole table reads in one
 // hold of the read lock. The updates waiting for the lock get it in between.
 const walkBatch = 10000
 // Overview holds figures about the whole table. Working them out takes a walk
 // over every prefix, so a caller asks for them now and then and keeps them.
 type Overview struct {
@@ -79,9 +83,8 @@ type OriginPeers struct {
 // Overview works out the table's overview. It lists at most maxListed bogon
 // announcements and at most maxListed prefixes with more than one origin AS:
-// the first in prefix order. It visits every prefix in the table, in batches
+// the first in prefix order. It walks over every prefix, but holds the read
-// of walkBatch. After each batch, it lets the table's lock go for as long as
+// lock for walkBatch prefixes at a time.
 // it held the lock for the batch.
 func (t *Table) Overview(maxListed int) Overview {
 	var overview Overview
@@ -111,18 +114,15 @@ func (t *Table) Overview(maxListed int) Overview {
 }
 // walkPrefixes calls visit with every prefix of the table and its origins. It
-// holds the read lock for walkBatch prefixes at a time. After each batch, it
+// holds the read lock, but lets it go after every walkBatch prefixes, so the
-// lets the table's lock go for as long as it held the lock for the batch.
+// updates waiting for it get in. A prefix that is added or removed in such a
-// During a walk over many batches, updates can then take the lock about half
+// gap may or may not be visited, as Go allows for a map that changes during a
-// of the time. The walk may or may not visit a prefix that is added or removed
+// range over it. visit must not keep origins once it returns.
 // while the lock is let go. Go allows this in a range over a map that changes.
 // visit must not keep origins once it returns.
 func (t *Table) walkPrefixes(visit func(prefix netip.Prefix, origins []*origin)) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
 	visited := 0
 	batchStart := time.Now()
 	for _, f := range []*family{&t.ipv4, &t.ipv6} {
 		for _, prefixes := range f.byLength {
@@ -131,13 +131,8 @@ func (t *Table) walkPrefixes(visit func(prefix netip.Prefix, origins []*origin))
 				visited++
 				if visited%walkBatch == 0 {
 					held := time.Since(batchStart)
 					t.mu.RUnlock()
 					time.Sleep(held)
 					t.mu.RLock()
 					batchStart = time.Now()
 				}
 			}
 		}
@@ -131,61 +131,3 @@ func TestWalkPrefixesLetsUpdatesIn(t *testing.T) {
 			"before its second batch")
 	}
 }
 // TestOverviewLetsUpdatesIn applies another peer's 1,000 announcements while
 // Overview walks a table with more prefixes than five of the walk's batches.
 // After each batch, the walk lets the lock go for as long as it held the lock.
 // So all 1,000 announcements must be applied before Overview returns. A walk
 // that takes the lock back at once lets in about one update per batch.
 func TestOverviewLetsUpdatesIn(t *testing.T) {
 	t.Parallel()
 	const (
 		asn       = 1000
 		peer      = "192.0.2.1"
 		otherPeer = "192.0.2.2"
 		// prefixCount is more prefixes than five of the walk's batches.
 		prefixCount   = 5*walkBatch + 1
 		announcements = 1000
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	prefixes := make([]netip.Prefix, 0, prefixCount)
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		prefixes = append(prefixes, prefix)
 		addr = addr.Next()
 	}
 	overviewDone := make(chan struct{})
 	go func() {
 		defer close(overviewDone)
 		table.Overview(0)
 	}()
 	// Wait until Overview holds the read lock. TryLock fails while a reader
 	// holds it.
 	for table.mu.TryLock() {
 		table.mu.Unlock()
 		runtime.Gosched()
 	}
 	for _, prefix := range prefixes[:announcements] {
 		table.Announce(prefix, asn, Route{Peer: otherPeer, Time: routeTime})
 	}
 	select {
 	case <-overviewDone:
 		t.Fatal("Overview returned before another peer's 1,000 announcements " +
 			"were applied")
 	default:
 	}
 	<-overviewDone
 }
@@ -27,11 +27,6 @@ const (
 	// kept routes in order: each of its nodes holds up to 63 times.
 	keptTimesDegree = 32
 	// walkBatch is how many prefixes a walk over the whole table visits in
 	// one hold of the lock. Overview and PeerDown each walk the whole table.
 	// Callers waiting for the lock get it between batches.
 	walkBatch = 10000
 	ipv4Bits = 32
 	ipv6Bits = 128
@@ -206,13 +201,8 @@ func (t *Table) Withdraw(prefix netip.Prefix, peer string) {
 }
 // PeerDown applies a peer's session going down: the peer leaves every peer
-// set, and every route of the peer is dropped. When the peer carries any
+// set, and every route of it is dropped. When the peer carries any prefix, it
-// prefix, PeerDown visits every prefix in the table, in batches of walkBatch.
+// visits every prefix in the table.
 // After each batch, it lets the table's lock go for as long as it held the
 // lock for the batch. During a walk over many batches, reads and updates can
 // then take the lock about half of the time. An announcement by the peer
 // applied during the walk may be dropped too. So the caller applies the peer's
 // later updates only once PeerDown has returned.
 func (t *Table) PeerDown(peer string) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
@@ -222,9 +212,6 @@ func (t *Table) PeerDown(peer string) {
 		return
 	}
 	visited := 0
 	batchStart := time.Now()
 	for _, f := range []*family{&t.ipv4, &t.ipv6} {
 		for _, prefixes := range f.byLength {
 			for prefix, origins := range prefixes {
@@ -232,19 +219,6 @@ func (t *Table) PeerDown(peer string) {
 				if o != nil {
 					t.leave(prefix, o, number)
 				}
 				// Go allows the map to change before the next step of
 				// the range over it.
 				visited++
 				if visited%walkBatch == 0 {
 					held := time.Since(batchStart)
 					t.mu.Unlock()
 					time.Sleep(held)
 					t.mu.Lock()
 					batchStart = time.Now()
 				}
 			}
 		}
 	}
@@ -1,69 +0,0 @@
 package routetable
 import (
 	"net/netip"
 	"runtime"
 	"testing"
 	"time"
 )
 // TestPeerDownLetsReadsIn reads the table's counts again and again while a peer
 // that carries more than two batches of prefixes goes down. PeerDown lets the
 // lock go after every walkBatch prefixes, so a read must get in while the peer
 // still carries some of its prefixes but no longer all.
 func TestPeerDownLetsReadsIn(t *testing.T) {
 	t.Parallel()
 	const (
 		asn  = 1000
 		peer = "192.0.2.1"
 		// prefixCount is more prefixes than two of walkBatch.
 		prefixCount = 2*walkBatch + 1
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		addr = addr.Next()
 	}
 	// Hold a read lock until PeerDown waits for the lock, so that the first
 	// read below starts once PeerDown holds it. TryRLock fails once a writer
 	// waits.
 	table.mu.RLock()
 	peerDownDone := make(chan struct{})
 	go func() {
 		defer close(peerDownDone)
 		table.PeerDown(peer)
 	}()
 	for table.mu.TryRLock() {
 		table.mu.RUnlock()
 		runtime.Gosched()
 	}
 	table.mu.RUnlock()
 	for {
 		routes := table.Counts().IPv4Routes
 		if routes > 0 && routes < prefixCount {
 			break
 		}
 		select {
 		case <-peerDownDone:
 			t.Fatal("no read got in while PeerDown ran")
 		default:
 		}
 	}
 	<-peerDownDone
 }
@@ -644,8 +644,9 @@ func TestShutdownDoesNotWaitForABlockedWrite(t *testing.T) {
 	}
 	rw.dbHandler = NewASHandler(store, log)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	startBlockedWrite(t, blocking, rw.dbHandler,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}})
+		[]*ristypes.RISMessage{{Path: fill}})
 	ctx, cancel := context.WithTimeout(t.Context(), deadline)
 	defer cancel()
@@ -18,34 +18,43 @@ const (
 	// (asnBatchTimeout), so a queue smaller than asnBatchSize is fine.
 	asHandlerQueueSize = 20000
-	// asnBatchSize is the number of ASes in a full batch, which wakes the
+	// asnBatchSize is the number of ASN operations to batch together
 	// flush goroutine to write it.
 	asnBatchSize = 30000
 	// asnBatchMaxSize is the most ASN operations the batch holds while the
 	// flush goroutine writes the previous one: ten batches, about 10 MiB
 	// (README "Memory"). At this size HandleMessage waits until the flush
 	// goroutine takes the batch.
 	asnBatchMaxSize = 300000
 	// asnBatchTimeout is the maximum time to wait before flushing a batch
 	// DO NOT reduce this timeout - larger batches are more efficient
 	asnBatchTimeout = 2 * time.Second
 )
-// ASHandler records every AS in the AS paths of BGP UPDATE messages. Its batch
+// ASHandler processes Autonomous System Number (ASN) information extracted from
-// holds the earliest and the latest time of each AS's updates. The flush
+// BGP UPDATE messages. It uses batched database operations to efficiently store
-// goroutine writes the batch to the database when it holds asnBatchSize ASes,
+// ASN data, collecting operations into batches that are flushed either when the
-// and every asnBatchTimeout.
+// batch reaches a size threshold or after a timeout period.
 type ASHandler struct {
 	db     database.Store
 	logger *logger.Logger
-	// Batching. mu guards batch and writing only. The flush goroutine takes
+	// batchMaxSize is asnBatchMaxSize. Only HandleMessage reads it, so a test
-	// the batch under mu and writes it after releasing mu. So HandleMessage
+	// may lower it before it hands the handler a message.
-	// never waits for a database write.
+	batchMaxSize int
-	mu sync.Mutex
+
-	// batch holds the earliest and the latest time of the updates for each AS
+	// Batching. mu guards batch and writing only: the flush goroutine takes
-	// since the flush goroutine last took it. It holds one entry per AS,
+	// the batch under mu and writes it after releasing mu, so HandleMessage
-	// however many updates arrive.
+	// waits for a database write only while batch is at batchMaxSize.
-	batch map[int]database.SeenTimes
+	mu    sync.Mutex
-	// writing is how many ASes the flush goroutine took from batch and has
+	batch []asnOp
-	// not finished writing.
+	// writing is how many operations the flush goroutine took from batch
-	writing     int
+	// and has not finished writing.
 	writing int
 	// batchTaken is signalled when the flush goroutine takes batch; its L is
 	// &mu.
 	batchTaken  sync.Cond
 	batchFullCh chan struct{} // wakes the flush goroutine when batch is full
 	// stopCh hands Stop's context to the flush goroutine. It holds one, so
 	// Stop does not wait for a write in progress to hand it over.
@@ -53,10 +62,16 @@ type ASHandler struct {
 	done   chan struct{} // closed when the flush goroutine returns
 }
 type asnOp struct {
 	number    int
 	timestamp time.Time
 }
 // NewASHandler creates and returns a new ASHandler instance. It initializes
 // the batching system and starts a background goroutine that periodically
-// writes the collected ASes to the database. The caller must call Stop when
+// flushes accumulated ASN operations to the database. The caller must call
-// finished, to write the pending ASes and end the background goroutine.
+// Stop when finished to ensure all pending operations are flushed and the
 // background goroutine is terminated.
 func NewASHandler(db database.Store, logger *logger.Logger) *ASHandler {
 	return newASHandler(db, logger, asnBatchTimeout)
 }
@@ -68,13 +83,15 @@ func newASHandler(
 	db database.Store, logger *logger.Logger, batchTimeout time.Duration,
 ) *ASHandler {
 	h := &ASHandler{
-		db:          db,
+		db:           db,
-		logger:      logger,
+		logger:       logger,
-		batch:       make(map[int]database.SeenTimes),
+		batchMaxSize: asnBatchMaxSize,
-		batchFullCh: make(chan struct{}, 1),
+		batch:        make([]asnOp, 0, asnBatchSize),
-		stopCh:      make(chan context.Context, 1),
+		batchFullCh:  make(chan struct{}, 1),
-		done:        make(chan struct{}),
+		stopCh:       make(chan context.Context, 1),
 		done:         make(chan struct{}),
 	}
 	h.batchTaken.L = &h.mu
 	// Start the flush timer goroutine
 	go flushLoop(batchTimeout, h.batchFullCh, h.stopCh, h.done, h.flushBatch)
@@ -98,25 +115,48 @@ func (h *ASHandler) QueueCapacity() int {
 	return asHandlerQueueSize
 }
-// HandleMessage adds the time of msg to the batch entry of each AS in its AS
+// HandleMessage processes a RIS Live BGP message by extracting all ASNs from
-// path, the origin AS and the members of an AS set included. When the batch
+// the AS path and queuing them for batch insertion into the database. The
-// holds asnBatchSize ASes, HandleMessage wakes the flush goroutine to write it.
+// origin ASN and all transit ASNs are recorded with their associated
 // timestamps. When the batch reaches the configured size threshold, the flush
 // goroutine is woken to write it.
 func (h *ASHandler) HandleMessage(msg *ristypes.RISMessage) {
 	// Use the pre-parsed timestamp
 	timestamp := msg.ParsedTimestamp
 	originASN := msg.Path.Origin()
 	h.mu.Lock()
 	defer h.mu.Unlock()
-	// The origin AS is the last AS of the sequence, so the loop adds it too.
+	// While the batch is at its maximum size, wait until the flush goroutine
 	// takes it. Meanwhile the handler takes nothing off its queue, which
 	// fills, and the streamer drops messages for it.
 	for len(h.batch) >= h.batchMaxSize {
 		h.batchTaken.Wait()
 	}
 	// Queue origin ASN operation
 	if originASN > 0 {
 		h.batch = append(h.batch, asnOp{
 			number:    originASN,
 			timestamp: timestamp,
 		})
 	}
 	// Also track all ASNs in the path, the members of an AS set included
 	for _, asn := range slices.Concat(msg.Path.Sequence, msg.Path.Set) {
 		if asn > 0 {
-			seen := h.batch[asn]
+			h.batch = append(h.batch, asnOp{
-			seen.Add(msg.ParsedTimestamp)
+				number:    asn,
-			h.batch[asn] = seen
+				timestamp: timestamp,
 			})
 		}
 	}
 	// A full batch wakes the flush goroutine. If it is writing, the wake-up
-	// waits in batchFullCh and the batch keeps taking updates until the write
+	// waits in batchFullCh and the batch keeps growing until the write ends
-	// ends.
+	// or the batch reaches batchMaxSize.
 	if len(h.batch) >= asnBatchSize {
 		select {
 		case h.batchFullCh <- struct{}{}:
@@ -125,11 +165,10 @@ func (h *ASHandler) HandleMessage(msg *ristypes.RISMessage) {
 	}
 }
-// Stop stops the flush goroutine and waits for it until ctx ends. The flush
+// Stop stops the flush goroutine, which writes the operations the handler holds
-// goroutine writes the batch before it returns, unless ctx has ended. A write
+// before it returns, and waits for it until ctx ends. Once ctx has ended the
-// still running when the process exits is lost. Stop logs how many entries are
+// flush goroutine skips that last write, and a write still running is lost
-// not written, in the batch being written and in the next batch. An AS in both
+// when the process exits, so Stop logs how many operations are not written.
 // batches counts twice.
 func (h *ASHandler) Stop(ctx context.Context) {
 	h.stopCh <- ctx
@@ -144,14 +183,14 @@ func (h *ASHandler) Stop(ctx context.Context) {
 	if unwritten > 0 {
 		h.logger.Error("Stop deadline passed before the AS handler wrote "+
-			"its batches", "batch_entries", unwritten)
+			"its updates", "updates", unwritten)
 	}
 }
-// takeBatch returns the pending ASes and leaves an empty batch in their place
+// takeBatch returns the pending operations and leaves an empty batch in their
-// for HandleMessage to fill. They count in writing until flushBatch has written
+// place for HandleMessage to fill. They count in writing until flushBatch has
-// them.
+// written them.
-func (h *ASHandler) takeBatch() map[int]database.SeenTimes {
+func (h *ASHandler) takeBatch() []asnOp {
 	h.mu.Lock()
 	defer h.mu.Unlock()
@@ -161,7 +200,8 @@ func (h *ASHandler) takeBatch() map[int]database.SeenTimes {
 	batch := h.batch
 	h.writing = len(batch)
-	h.batch = make(map[int]database.SeenTimes)
+	h.batch = make([]asnOp, 0, asnBatchSize)
 	h.batchTaken.Broadcast()
 	return batch
 }
@@ -174,11 +214,21 @@ func (h *ASHandler) flushBatch() {
 		return
 	}
 	// The earliest and the latest time the batch saw each AS. The batch holds
 	// several updates for an AS, from many peers, so a new AS is stored first
 	// seen at the earliest of them and last seen at the latest.
 	asns := make(map[int]database.SeenTimes)
 	for _, op := range batch {
 		seen := asns[op.number]
 		seen.Add(op.timestamp)
 		asns[op.number] = seen
 	}
 	// Process all ASNs in a single batch transaction
-	err := h.db.GetOrCreateASNBatch(batch)
+	err := h.db.GetOrCreateASNBatch(asns)
 	if err != nil {
 		h.logger.Error("Failed to process ASN batch",
-			"error", err, "count", len(batch))
+			"error", err, "count", len(asns))
 	}
 	h.mu.Lock()
@@ -5,43 +5,28 @@ import (
 	"slices"
 	"testing"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 )
 // pathOfASes returns an AS path of n different ASes: AS 1 to AS n. With n up to
 // asnBatchSize, none of them is testASNA to testASND.
 func pathOfASes(n int) ristypes.ASPath {
 	sequence := make([]int, n)
 	for i := range sequence {
 		sequence[i] = i + 1
 	}
 	return ristypes.ASPath{Sequence: sequence}
 }
 // TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS handles two updates
-// whose path carries an AS the database does not hold yet, in one batch into a
+// whose path carries an AS the database does not hold yet, the second 5
-// real database. The second is 5 seconds after the first, and the handler gets
+// seconds after the first, in one batch into a real database. The AS is stored
-// it first. The AS is stored first seen at the time of the first update and
+// first seen at the time of the first update and last seen at the time of the
-// last seen at the time of the second.
+// second.
 func TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS(t *testing.T) {
 	t.Parallel()
 	db := newTestDatabase(t)
 	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{
+	h := &ASHandler{db: db, logger: logger.New(), batchMaxSize: asnBatchMaxSize}
 		db: db, logger: logger.New(), batch: make(map[int]database.SeenTimes),
 	}
 	first := peerAnnouncement(testPeerIP, testV4Prefix)
 	second := peerAnnouncement(testPeerIP, testV4Prefix)
 	second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
 	h.HandleMessage(second)
 	h.HandleMessage(first)
 	h.HandleMessage(second)
 	h.flushBatch()
 	asn, _, err := db.GetAS(t.Context(), testASNA)
@@ -69,9 +54,7 @@ func TestASHandlerRecordsNothingFromAPathWithASZero(t *testing.T) {
 	store := newMockStore()
 	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{
+	h := &ASHandler{db: store, logger: logger.New(), batchMaxSize: asnBatchMaxSize}
 		db: store, logger: logger.New(), batch: make(map[int]database.SeenTimes),
 	}
 	msg := peerAnnouncement(testPeerIP, testV4Prefix)
 	msg.Path = decodePath(t, testASNA, 0, testASNB)
@@ -187,33 +187,25 @@ func (f *ASNFetcher) recordSuccess() {
 	f.statsMu.Unlock()
 }
-// lengthenInterval makes the interval 1.5 times as long, up to maxInterval.
+// recordFailure increases the interval on failed fetch using exponential backoff.
-// A failed lookup and a skipped one both lengthen it.
+func (f *ASNFetcher) recordFailure() {
 func (f *ASNFetcher) lengthenInterval() {
 	f.intervalMu.Lock()
-	defer f.intervalMu.Unlock()
+	f.consecutiveFails++
 	// Exponential backoff: multiply by 1.5, capped at max
 	newInterval := min(
 		f.currentInterval*backoffNumerator/backoffDenominator, maxInterval)
 	if newInterval != f.currentInterval {
-		f.logger.Debug("Increased fetch interval",
+		f.logger.Debug("Increased fetch interval due to failure",
 			"old_interval", f.currentInterval,
 			"new_interval", newInterval,
 			"consecutive_failures", f.consecutiveFails,
 		)
 		f.currentInterval = newInterval
 	}
 }
 // recordFailure counts a failed fetch and lengthens the interval.
 func (f *ASNFetcher) recordFailure() {
 	f.intervalMu.Lock()
 	f.consecutiveFails++
 	f.intervalMu.Unlock()
 	f.lengthenInterval()
 	// Record error time for stats, dropping those older than statsWindow
 	f.statsMu.Lock()
 	now := f.now()
@@ -295,16 +287,6 @@ func (f *ASNFetcher) fetchNextStale(ctx context.Context) {
 // so the AS stays stale. An AS IANA refers to no RIR is stored with no
 // WHOIS data, so it is not looked up again until it is stale; that counts
 // as neither a success nor a failure.
 //
 // The WHOIS client pauses an RIR's or NIC.br's server for whois.PauseTime
 // after the server refuses a query. Lookups at the other servers go on. IANA
 // is never paused, so a refusal by IANA is an ordinary failure. A lookup
 // whose RIR is paused fails with whois.ErrPaused and is skipped. A skipped
 // lookup leaves the AS stale and is not counted as a failure. Like a
 // failure, a skipped lookup lengthens the interval. Each lookup asks IANA
 // before it finds its RIR paused, so with a one-second interval the fetcher
 // would ask IANA every second. The lookups that QueueImmediate asks for also
 // run through fetchAndUpdate.
 func (f *ASNFetcher) fetchAndUpdate(ctx context.Context, asn int) bool {
 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
@@ -325,14 +307,6 @@ func (f *ASNFetcher) fetchAndUpdate(ctx context.Context, asn int) bool {
 		return false
 	}
 	if errors.Is(err, whois.ErrPaused) {
 		f.logger.Info("Skipped WHOIS lookup, the RIR's server is paused",
 			"asn", asn, "error", err)
 		f.lengthenInterval()
 		return false
 	}
 	if err != nil {
 		f.logger.Error("WHOIS lookup failed", "asn", asn, "error", err)
 		f.recordFailure()
@@ -13,7 +13,6 @@ import (
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/whois"
 )
 // The WHOIS servers a lookup asks: IANA first, then the RIR IANA refers it
@@ -132,151 +131,6 @@ func TestFetchAndUpdateKeepsTheRowWhenTheLookupFails(t *testing.T) {
 	}
 }
 // TestFetchAndUpdateWaitsOutAPause looks up an AS at RIPE while RIPE refuses
 // the query. The test sets the WHOIS client's clock. The next lookup comes a
 // second before whois.PauseTime has passed. It sends RIPE nothing and leaves
 // the AS never looked up. It counts as neither a success nor a failure. A
 // lookup at whois.PauseTime asks RIPE again.
 func TestFetchAndUpdateWaitsOutAPause(t *testing.T) {
 	t.Parallel()
 	f, db := newFetcherWithWHOISAnswers(t, map[string]string{
 		ianaWHOISServer: ianaRefersToRIPE,
 		ripeWHOISServer: ripeAccessDenied,
 	})
 	ripeAsks := 0
 	dial := f.whoisClient.DialContext
 	f.whoisClient.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ripeWHOISServer {
 			ripeAsks++
 		}
 		return dial(ctx, network, address)
 	}
 	start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	now := start
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	now = start.Add(whois.PauseTime - time.Second)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	if ripeAsks != 1 {
 		t.Errorf("RIPE was asked %d times during its pause, want 1", ripeAsks)
 	}
 	stats, err := db.GetWHOISStats(t.Context(), whoisStaleThreshold)
 	if err != nil {
 		t.Fatalf("GetWHOISStats: %v", err)
 	}
 	if stats.NeverFetched != 1 {
 		t.Errorf("never looked up = %d, want 1", stats.NeverFetched)
 	}
 	got := f.GetStats()
 	if got.ConsecutiveFails != 1 || got.ErrorsLastHour != 1 ||
 		got.SuccessesLastHour != 0 {
 		t.Errorf("%d failures in a row, %d errors, %d successes; want 1, 1, 0",
 			got.ConsecutiveFails, got.ErrorsLastHour, got.SuccessesLastHour)
 	}
 	now = start.Add(whois.PauseTime)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	if ripeAsks != 2 {
 		t.Errorf("RIPE was asked %d times after its pause, want 2", ripeAsks)
 	}
 }
 // TestFetchAndUpdateBacksOffDuringAPause looks up an AS at RIPE while RIPE
 // refuses the query. The refusal pauses RIPE for an hour, so every later
 // lookup in the test is skipped. The test sets the WHOIS client's clock and
 // looks the AS up again each time the interval has passed. Like a failure,
 // each skip must make the interval 1.5 times as long, up to one minute. The
 // skips must not count as failures.
 func TestFetchAndUpdateBacksOffDuringAPause(t *testing.T) {
 	t.Parallel()
 	f, _ := newFetcherWithWHOISAnswers(t, map[string]string{
 		ianaWHOISServer: ianaRefersToRIPE,
 		ripeWHOISServer: ripeAccessDenied,
 	})
 	now := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	for i, want := range []time.Duration{
 		33750 * time.Millisecond,
 		50625 * time.Millisecond,
 		time.Minute,
 		time.Minute,
 	} {
 		now = now.Add(f.getInterval())
 		f.fetchAndUpdate(t.Context(), testASNA)
 		if got := f.getInterval(); got != want {
 			t.Errorf("interval after %d skipped lookups = %v, want %v",
 				i+1, got, want)
 		}
 	}
 	got := f.GetStats()
 	if got.ConsecutiveFails != 1 || got.ErrorsLastHour != 1 {
 		t.Errorf("%d failures in a row and %d errors, want 1 and 1",
 			got.ConsecutiveFails, got.ErrorsLastHour)
 	}
 }
 // TestFetchAndUpdateKeepsAskingIANA looks up an AS while IANA's server
 // refuses the connection. The test sets the WHOIS client's clock. The next
 // lookup comes a second before whois.PauseTime has passed. IANA is never
 // paused, so that lookup asks IANA again. Each refusal counts as a failure.
 func TestFetchAndUpdateKeepsAskingIANA(t *testing.T) {
 	t.Parallel()
 	// With no answers, every server refuses the connection.
 	f, _ := newFetcherWithWHOISAnswers(t, map[string]string{})
 	ianaAsks := 0
 	dial := f.whoisClient.DialContext
 	f.whoisClient.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ianaWHOISServer {
 			ianaAsks++
 		}
 		return dial(ctx, network, address)
 	}
 	start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	now := start
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	now = start.Add(whois.PauseTime - time.Second)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	got := f.GetStats()
 	if ianaAsks != 2 || got.ConsecutiveFails != 2 {
 		t.Errorf("IANA was asked %d times, with %d failures in a row; "+
 			"want 2 and 2", ianaAsks, got.ConsecutiveFails)
 	}
 }
 // TestRecordStepsTheInterval has the fetcher fail from its base interval of
 // 15 seconds, then succeed. Each failure makes the interval 1.5 times as
 // long, up to one minute, and each success halves it, down to one second.
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log/slog"
 	"slices"
 	"sync"
@@ -178,14 +177,12 @@ type stopLog struct {
 	Msg          string `json:"msg"`
 	Updates      int    `json:"updates"`
 	TableChanges int    `json:"table_changes"`
 	HeldMessages int    `json:"held_messages"`
 	Paths        int    `json:"paths"`
 	BatchEntries int    `json:"batch_entries"`
 }
 // newErrorLogger returns a logger that writes only errors, as JSON lines, to
 // logs.
-func newErrorLogger(logs io.Writer) *logger.Logger {
+func newErrorLogger(logs *bytes.Buffer) *logger.Logger {
 	return &logger.Logger{Logger: slog.New(slog.NewJSONHandler(logs,
 		&slog.HandlerOptions{Level: slog.LevelError}))}
 }
@@ -498,20 +495,20 @@ func TestPrefixHandlerStopCountsTheTableChangesOfAWriteInProgress(t *testing.T)
 	}
 }
 // TestASHandlerSkipsItsLastWriteAfterTheStopDeadline also checks what Stop
 // logs: the asnBatchSize entries of the held write and the entry for testASNB,
 // handled since, are not written.
 func TestASHandlerSkipsItsLastWriteAfterTheStopDeadline(t *testing.T) {
 	t.Parallel()
-	const wantEntries = asnBatchSize + 1
+	// Each message gives an update for its origin AS and one for each AS
 	// in its path: fill asnBatchSize+1, extra 2.
 	const wantUpdates = asnBatchSize + 1 + 2
 	var logs bytes.Buffer
 	store := newBlockingStore()
 	h := newASHandler(store, newErrorLogger(&logs), longerThanAnyTest)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}},
+		[]*ristypes.RISMessage{{Path: fill}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
@@ -521,27 +518,26 @@ func TestASHandlerSkipsItsLastWriteAfterTheStopDeadline(t *testing.T) {
 		t.Errorf("AS%d was written after the stop deadline", testASNB)
 	}
-	if logged := lastLogged(t, &logs); logged.BatchEntries != wantEntries {
+	if logged := lastLogged(t, &logs); logged.Updates != wantUpdates {
-		t.Errorf("Stop logged %d batch entries not written, want %d",
+		t.Errorf("Stop logged %d updates not written, want %d",
-			logged.BatchEntries, wantEntries)
+			logged.Updates, wantUpdates)
 	}
 }
 // TestASHandlerSkipsAFullBatchAfterTheStopDeadline hands the AS handler a full
 // batch while a write is held, so the batch's wake-up of the flush goroutine
-// waits. The full batch holds the fill's ASes again, and testASNB. The stop
+// waits. The stop deadline passes meanwhile. When the write ends, the flush
-// deadline passes meanwhile. When the write ends, the flush goroutine must stop
+// goroutine must stop instead of writing the batch.
 // instead of writing the batch.
 func TestASHandlerSkipsAFullBatchAfterTheStopDeadline(t *testing.T) {
 	t.Parallel()
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
-	fill := &ristypes.RISMessage{Path: pathOfASes(asnBatchSize)}
+	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	full := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNB}, asnBatchSize)}
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
-		[]*ristypes.RISMessage{fill},
+		[]*ristypes.RISMessage{{Path: fill}},
-		fill,
+		&ristypes.RISMessage{Path: full})
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
 	defer store.mu.Unlock()
@@ -707,8 +703,9 @@ func TestASHandlerHandlesMessagesWhileAWriteIsBlocked(t *testing.T) {
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	handleWhileAWriteIsBlocked(t, store, h,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}},
+		[]*ristypes.RISMessage{{Path: fill}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
@@ -765,41 +762,25 @@ func TestPrefixHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 	}
 }
-// TestASHandlerNeverWaitsForAWrite starts a write that the store holds. Then it
+func TestASHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 // hands the AS handler twenty messages whose paths each hold one AS
 // asnBatchSize times. HandleMessage must return each time, and the batch must
 // hold one entry, for that AS.
 func TestASHandlerNeverWaitsForAWrite(t *testing.T) {
 	t.Parallel()
 	const messages = 20
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
 	h.batchMaxSize = asnBatchSize
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	toMax := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	handleAtMaxBatchSize(t, store, h,
 		[]*ristypes.RISMessage{{Path: fill}},
 		[]*ristypes.RISMessage{{Path: toMax}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
-	defer stopInTime(t, h)
+	store.mu.Lock()
-	defer store.releaseWrites()
+	defer store.mu.Unlock()
-	startBlockedWrite(t, store, h,
+	if !store.asns[testASNB] {
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}})
+		t.Errorf("Stop did not write AS%d, handled after the batch reached its "+
-
+			"maximum size", testASNB)
 	oneAS := &ristypes.RISMessage{
 		Path: ristypes.ASPath{Sequence: slices.Repeat([]int{testASNB}, asnBatchSize)},
 	}
 	if !returnsInTime(func() {
 		for range messages {
 			h.HandleMessage(oneAS)
 		}
 	}) {
 		t.Fatal("HandleMessage did not return while a database write was blocked")
 	}
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	if len(h.batch) != 1 {
 		t.Errorf("the batch holds %d entries for one AS, want 1", len(h.batch))
 	}
 }
@@ -863,11 +844,13 @@ func TestHandlersWakeTheFlushGoroutineWhenTheBatchIsFull(t *testing.T) {
 			batchSize: asnBatchSize,
 			handle: func(n int) chan struct{} {
 				h := &ASHandler{
-					batch:       make(map[int]database.SeenTimes),
+					batchMaxSize: asnBatchMaxSize,
-					batchFullCh: make(chan struct{}, 1),
+					batchFullCh:  make(chan struct{}, 1),
 				}
-				// Each of the path's n ASes is one entry of the batch.
+				// The origin AS and each AS in the path are one update each.
-				h.HandleMessage(&ristypes.RISMessage{Path: pathOfASes(n)})
+				h.HandleMessage(&ristypes.RISMessage{
 					Path: ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, n-1)},
 				})
 				return h.batchFullCh
 			},
@@ -44,12 +44,6 @@ const (
 	// most one pair. So the million pairs that a full-table peer's session
 	// going down changes are written in about a minute.
 	maxTableChangesPerWrite = 20000
 	// maxHeldBackMessages is the most messages the handler holds back from
 	// peers whose PeerDown has not returned. A message takes about 1 KiB, so
 	// that many take about 20 MiB (README "Memory"). At this number
 	// HandleMessage waits until one of them is applied.
 	maxHeldBackMessages = 20000
 )
 // PrefixHandler keeps the routing table in memory current from the feed. It
@@ -58,15 +52,6 @@ const (
 // does an announcement whose AS path is empty or holds AS 0 anywhere. A peer
 // whose BGP session goes down leaves every prefix.
 //
 // The table's PeerDown applies a session going down. It visits every prefix,
 // which takes seconds on a full table. So the handler runs PeerDown on
 // a separate goroutine, one peer at a time, and goes on taking messages
 // meanwhile. PeerDown lets the table's lock go about half of the time, so the
 // handler applies other peers' messages while PeerDown runs. The handler holds
 // back the down peer's later messages until PeerDown returns. Then the handler
 // applies them in order, one at a time, and takes new messages in between. It
 // holds back at most maxHeldBackMessages messages.
 //
 // Each flush writes the table's changes to the database. It also stores each
 // prefix the updates name with the time it was first seen.
 type PrefixHandler struct {
@@ -82,7 +67,7 @@ type PrefixHandler struct {
 	// give a smaller one.
 	tableChangesPerWrite int
-	// Batching. mu guards batch, writing and writingTableChanges: the
+	// Batching. mu guards batch, writing and writingTableChanges only: the
 	// flush goroutine takes them under mu and writes them after releasing
 	// mu, so HandleMessage waits for a database write only while batch is at
 	// batchMaxSize.
@@ -102,21 +87,6 @@ type PrefixHandler struct {
 	// Stop does not wait for a write in progress to hand it over.
 	stopCh chan context.Context
 	done   chan struct{} // closed when the flush goroutine returns
 	// Peers whose session went down. peerDownMu lets one PeerDown run at a
 	// time, so the handler's own updates wait for the table's lock behind
 	// at most one. heldBack, under mu, holds each such peer's later
 	// messages, in order, until its PeerDown has returned and they are
 	// applied. A peer with no such messages yet has an empty entry.
 	// heldCount, under mu, is how many messages heldBack holds.
 	// heldTaken is signalled each time a held-back message is taken out to
 	// be applied; its L is &mu. peerDowns counts the peerDown goroutines
 	// that have not returned.
 	peerDownMu sync.Mutex
 	heldBack   map[string][]*ristypes.RISMessage
 	heldCount  int
 	heldTaken  sync.Cond
 	peerDowns  sync.WaitGroup
 }
 // seenPrefix is what the batch keeps of an update: the prefix it names and its
@@ -180,10 +150,8 @@ func newPrefixHandler(
 		batchFullCh:          make(chan struct{}, 1),
 		stopCh:               make(chan context.Context, 1),
 		done:                 make(chan struct{}),
 		heldBack:             make(map[string][]*ristypes.RISMessage),
 	}
 	h.batchTaken.L = &h.mu
 	h.heldTaken.L = &h.mu
 	// Start the flush timer goroutine
 	go flushLoop(batchTimeout, h.batchFullCh, h.stopCh, h.done, h.flushBatch)
@@ -211,91 +179,11 @@ func (h *PrefixHandler) QueueCapacity() int {
 	return prefixHandlerQueueSize
 }
-// HandleMessage processes a message to track prefix information. A message
+// HandleMessage processes a message to track prefix information
 // from a peer whose PeerDown has not returned is held back until it has.
 func (h *PrefixHandler) HandleMessage(msg *ristypes.RISMessage) {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	// While maxHeldBackMessages messages are held back, wait until one of them
 	// is taken out to be applied. Meanwhile the handler takes nothing off its
 	// queue, as at batchMaxSize.
 	for h.heldCount >= maxHeldBackMessages {
 		h.heldTaken.Wait()
 	}
 	held, goingDown := h.heldBack[msg.Peer]
 	if goingDown {
 		h.heldBack[msg.Peer] = append(held, msg)
 		h.heldCount++
 		return
 	}
 	h.applyMessage(msg)
 }
 // Stop waits for every PeerDown the handler started and for the messages held
 // back meanwhile to be applied. It gives up this wait once ctx ends. Then Stop
 // stops the flush goroutine and waits for it until ctx ends. The flush
 // goroutine makes one last flush before it returns. That flush writes at most
 // tableChangesPerWrite of the routing table's changes, and the prefixes of the
 // updates the handler holds. Once ctx has ended the flush goroutine skips that
 // last flush, and a write still running is lost when the process exits. A
 // failed write of the table's changes is not retried either. Stop logs how
 // many updates and table changes are not written. It also logs how many
 // held-back messages are not applied. The caller calls Stop once its last
 // HandleMessage has returned.
 func (h *PrefixHandler) Stop(ctx context.Context) {
 	peerDownsDone := make(chan struct{})
 	go func() {
 		h.peerDowns.Wait()
 		close(peerDownsDone)
 	}()
 	select {
 	case <-peerDownsDone:
 	case <-ctx.Done():
 	}
 	h.stopCh <- ctx
 	select {
 	case <-h.done:
 	case <-ctx.Done():
 	}
 	h.mu.Lock()
 	unwritten := h.writing + len(h.batch)
 	tableChanges := h.writingTableChanges + h.table.ChangeCount()
 	heldMessages := h.heldCount
 	h.mu.Unlock()
 	if unwritten == 0 && tableChanges == 0 && heldMessages == 0 {
 		return
 	}
 	if ctx.Err() != nil {
 		h.logger.Error("Stop deadline passed before the prefix handler wrote "+
 			"its updates", "updates", unwritten, "table_changes", tableChanges,
 			"held_messages", heldMessages)
 		return
 	}
 	h.logger.Error("The prefix handler stopped before it wrote everything",
 		"updates", unwritten, "table_changes", tableChanges,
 		"held_messages", heldMessages)
 }
 // applyMessage applies msg. The caller holds mu. A peer's session going down
 // starts the peer's PeerDown. An update is applied to the routing table, and
 // its prefixes join the batch.
 func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	if msg.Type == ristypes.MessageTypeState {
 		if msg.State == ristypes.StateDown {
-			h.startPeerDown(msg.Peer)
+			h.table.PeerDown(msg.Peer)
 		}
 		return
@@ -310,6 +198,9 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	// the path after the rest of it.
 	path := slices.Concat(msg.Path.Sequence, msg.Path.Set)
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	// While the batch is at its maximum size, wait until the flush goroutine
 	// takes it. Meanwhile the handler takes nothing off its queue, which
 	// fills, and the streamer drops messages for it.
@@ -370,58 +261,39 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	}
 }
-// startPeerDown starts peerDown for peer on a new goroutine. The caller holds
+// Stop stops the flush goroutine, which makes one last flush before it returns,
-// mu. The peer's messages are held back until peerDown has applied them.
+// and waits for it until ctx ends. That flush writes at most
-// Messages held back for an earlier PeerDown of the peer, and not yet applied,
+// tableChangesPerWrite of the routing table's changes, and the prefixes of
-// stay held back.
+// the updates the handler holds. Once ctx has ended the flush goroutine skips
-func (h *PrefixHandler) startPeerDown(peer string) {
+// that last flush, and a write still running is lost when the process exits. A
-	_, goingDown := h.heldBack[peer]
+// failed write of the table's changes is not retried either. Stop logs how many
-	if !goingDown {
+// updates and how many of the table's changes are not written.
-		h.heldBack[peer] = []*ristypes.RISMessage{}
+func (h *PrefixHandler) Stop(ctx context.Context) {
 	h.stopCh <- ctx
 	select {
 	case <-h.done:
 	case <-ctx.Done():
 	}
-	h.peerDowns.Add(1)
+	h.mu.Lock()
 	unwritten := h.writing + len(h.batch)
 	tableChanges := h.writingTableChanges + h.table.ChangeCount()
 	h.mu.Unlock()
-	go h.peerDown(peer)
+	if unwritten == 0 && tableChanges == 0 {
-}
+		return
 // peerDown runs the table's PeerDown for peer, once no other PeerDown is
 // running. Then peerDown applies the messages held back from the peer, in
 // order. It takes mu for one message at a time, so HandleMessage takes new
 // messages in between. The peer's new messages join the end of the held-back
 // ones. A held-back message that says the peer's session went down again
 // starts a new peerDown, which applies the rest.
 func (h *PrefixHandler) peerDown(peer string) {
 	defer h.peerDowns.Done()
 	h.peerDownMu.Lock()
 	h.table.PeerDown(peer)
 	h.peerDownMu.Unlock()
 	for {
 		h.mu.Lock()
 		held := h.heldBack[peer]
 		if len(held) == 0 {
 			delete(h.heldBack, peer)
 			h.mu.Unlock()
 			return
 		}
 		msg := held[0]
 		held[0] = nil // so that the message is freed once applied
 		h.heldBack[peer] = held[1:]
 		h.heldCount--
 		h.heldTaken.Broadcast()
 		h.applyMessage(msg)
 		h.mu.Unlock()
 		if msg.Type == ristypes.MessageTypeState &&
 			msg.State == ristypes.StateDown {
 			return
 		}
 	}
 	if ctx.Err() != nil {
 		h.logger.Error("Stop deadline passed before the prefix handler wrote "+
 			"its updates", "updates", unwritten, "table_changes", tableChanges)
 		return
 	}
 	h.logger.Error("The prefix handler stopped before it wrote everything",
 		"updates", unwritten, "table_changes", tableChanges)
 }
 // takeBatch returns the pending updates and leaves an empty batch in their
@@ -237,83 +237,6 @@ func TestPrefixHandlerStopLogsNothingWhenItWroteEverything(t *testing.T) {
 	}
 }
 // TestPrefixHandlerStopLogsTheMessagesHeldBack stops a prefix handler with a
 // deadline that has passed, while a peer's PeerDown is held up and one message
 // of the peer is held back. Stop must log that message as not applied.
 func TestPrefixHandlerStopLogsTheMessagesHeldBack(t *testing.T) {
 	t.Parallel()
 	var logs bytes.Buffer
 	h := newPrefixHandler(newMockStore(), newErrorLogger(&logs),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	h.peerDownMu.Lock()
 	defer h.peerDownMu.Unlock()
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	h.HandleMessage(sessionDown())
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV6Prefix))
 	ctx, cancel := context.WithCancel(t.Context())
 	cancel()
 	h.Stop(ctx)
 	logged := lastLogged(t, &logs)
 	if logged.HeldMessages != 1 {
 		t.Errorf("Stop logged %d held messages not applied, want 1",
 			logged.HeldMessages)
 	}
 }
 // TestPrefixHandlerStopWaitsForTheMessagesHeldBack stops a prefix handler
 // while a peer's PeerDown is held up and an announcement of the peer is held
 // back. Stop must wait. Once the PeerDown is let go and Stop returns, the
 // announcement must be in the database.
 func TestPrefixHandlerStopWaitsForTheMessagesHeldBack(t *testing.T) {
 	t.Parallel()
 	db := newTestDatabase(t)
 	h := newPrefixHandler(db, logger.New(), routetable.New(routetable.Params{}),
 		longerThanAnyTest, maxTableChangesPerWrite)
 	h.peerDownMu.Lock()
 	h.HandleMessage(sessionDown())
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	stopped := make(chan struct{})
 	go func() {
 		h.Stop(t.Context())
 		close(stopped)
 	}()
 	select {
 	case <-stopped:
 		t.Error("Stop returned while a PeerDown was held up")
 	case <-time.After(stillWaitingAfter):
 	}
 	h.peerDownMu.Unlock()
 	select {
 	case <-stopped:
 	case <-time.After(stepTimeout):
 		t.Fatalf("Stop did not return within %s of the PeerDown's release",
 			stepTimeout)
 	}
 	read, err := db.ReadRouteTable(t.Context())
 	if err != nil {
 		t.Fatalf("ReadRouteTable: %v", err)
 	}
 	checkTableOrigins(t, read, map[string]map[int][]string{
 		testV4Prefix: {testASNB: {testPeerIP}},
 	})
 }
 // longerThanAnyTest is a timer interval that no test lasts. A test gives it to
 // newPrefixHandler, newASHandler, newPeerHandler or newPeeringHandler when the
 // handler must write only when its batch is full, when the test says, or on
@@ -330,7 +253,6 @@ func prefixHandlerWithoutTimer(store database.Store) *PrefixHandler {
 		table:                routetable.New(routetable.Params{}),
 		batchMaxSize:         prefixBatchMaxSize,
 		tableChangesPerWrite: maxTableChangesPerWrite,
 		heldBack:             make(map[string][]*ristypes.RISMessage),
 	}
 }
@@ -7,10 +7,8 @@ import (
 	"log/slog"
 	"net/netip"
 	"reflect"
 	"runtime"
 	"slices"
 	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -103,228 +101,6 @@ func TestPrefixHandlerAppliesUpdatesToTheRoutingTable(t *testing.T) {
 	})
 }
 // TestPrefixHandlerTakesMessagesWhileAPeerGoesDown holds up the PeerDown of a
 // peer whose session went down, as another peer's long PeerDown would. The
 // handler must go on taking messages. It applies another peer's announcement
 // at once. It holds back these messages of the down peer, in this order:
 //   - an announcement;
 //   - its session going down again;
 //   - a second announcement.
 //
 // Once the PeerDowns have returned, the down peer must carry only the prefix
 // of the second announcement.
 func TestPrefixHandlerTakesMessagesWhileAPeerGoesDown(t *testing.T) {
 	t.Parallel()
 	h := prefixHandlerWithoutTimer(newMockStore())
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	h.peerDownMu.Lock()
 	handled := returnsInTime(func() {
 		for _, msg := range []*ristypes.RISMessage{
 			sessionDown(),
 			peerAnnouncement(secondPeerIP, otherV4Prefix),
 			peerAnnouncement(testPeerIP, testV6Prefix),
 			sessionDown(),
 			peerAnnouncement(testPeerIP, setV4Prefix),
 		} {
 			h.HandleMessage(msg)
 		}
 	})
 	if !handled {
 		t.Fatalf("the handler did not take the messages after the session "+
 			"went down within %s", stepTimeout)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV4Prefix:  {testASNB: {testPeerIP}},
 		otherV4Prefix: {testASNB: {secondPeerIP}},
 		testV6Prefix:  {},
 		setV4Prefix:   {},
 	})
 	h.peerDownMu.Unlock()
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeerDowns did not return within %s", stepTimeout)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV4Prefix:  {},
 		otherV4Prefix: {testASNB: {secondPeerIP}},
 		testV6Prefix:  {},
 		setV4Prefix:   {testASNB: {testPeerIP}},
 	})
 }
 // TestPrefixHandlerAppliesMessagesWhilePeerDownRuns gives a peer 50,000
 // prefixes and hands the prefix handler that peer's session going down. The
 // table's PeerDown then visits the prefixes in five batches. Once PeerDown has
 // begun, the handler is handed 1,000 announcements of another peer. The
 // handler must apply them all before PeerDown ends, while the down peer still
 // carries some of its prefixes.
 func TestPrefixHandlerAppliesMessagesWhilePeerDownRuns(t *testing.T) {
 	t.Parallel()
 	const (
 		// downPeerPrefixes is five times the 10,000 prefixes PeerDown visits
 		// in one hold of the table's lock.
 		downPeerPrefixes = 50000
 		// otherPeerMessages is far more messages than the handler applies
 		// while PeerDown runs, if PeerDown takes the lock back at once after
 		// each batch. The handler then applies only a few for each batch.
 		otherPeerMessages = 1000
 		// firstOtherAddr is the address of the other peer's first prefix.
 		firstOtherAddr = "2001:db8:2::"
 	)
 	h := prefixHandlerWithoutTimer(newMockStore())
 	announceManyPrefixes(h.table, downPeerPrefixes)
 	h.HandleMessage(sessionDown())
 	// Wait until PeerDown has begun: the down peer has left some of its
 	// prefixes. The down peer's prefixes are IPv4 and the other peer's are
 	// IPv6, so the counts tell them apart.
 	for h.table.Counts().IPv4Routes == downPeerPrefixes {
 		runtime.Gosched()
 	}
 	// Each announcement names the /128 of the next address.
 	addr := netip.MustParseAddr(firstOtherAddr)
 	for range otherPeerMessages {
 		h.HandleMessage(peerAnnouncement(secondPeerIP,
 			netip.PrefixFrom(addr, addr.BitLen()).String()))
 		addr = addr.Next()
 	}
 	counts := h.table.Counts()
 	if counts.IPv6Routes != otherPeerMessages {
 		t.Errorf("the other peer carries %d prefixes, want %d",
 			counts.IPv6Routes, otherPeerMessages)
 	}
 	if counts.IPv4Routes == 0 {
 		t.Errorf("PeerDown ended before the handler applied the other peer's "+
 			"%d announcements", otherPeerMessages)
 	}
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeerDown did not return within %s", stepTimeout)
 	}
 }
 // TestPrefixHandlerTakesMessagesWhileItAppliesHeldBackOnes holds back many
 // messages of a peer whose session went down. Each names a prefix that does
 // not parse, so applying it logs an error. Each log write takes a
 // millisecond. While the handler applies the held-back messages, it must take
 // another peer's announcement.
 func TestPrefixHandlerTakesMessagesWhileItAppliesHeldBackOnes(t *testing.T) {
 	t.Parallel()
 	const (
 		// heldMessages take the handler at least a second to apply.
 		heldMessages = 1000
 		badPrefix    = "not a prefix"
 	)
 	logs := &slowWriter{firstWrite: make(chan struct{})}
 	h := newPrefixHandler(newMockStore(), newErrorLogger(logs),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	h.peerDownMu.Lock()
 	h.HandleMessage(sessionDown())
 	for range heldMessages {
 		h.HandleMessage(peerAnnouncement(testPeerIP, badPrefix))
 	}
 	h.peerDownMu.Unlock()
 	select {
 	case <-logs.firstWrite:
 	case <-time.After(stepTimeout):
 		t.Fatal("the handler did not start to apply the held-back messages")
 	}
 	if !returnsInTime(func() {
 		h.HandleMessage(peerAnnouncement(secondPeerIP, otherV4Prefix))
 	}) {
 		t.Fatalf("HandleMessage did not return within %s", stepTimeout)
 	}
 	h.mu.Lock()
 	left := len(h.heldBack[testPeerIP])
 	h.mu.Unlock()
 	if left == 0 {
 		t.Error("the handler took another peer's announcement only once it " +
 			"had applied every held-back message")
 	}
 }
 // TestPrefixHandlerWaitsAtTheMaximumHeldBack holds up the PeerDown of a peer
 // whose session went down. It hands the handler maxHeldBackMessages messages
 // of that peer. HandleMessage must then wait, even for another peer's
 // message, until the PeerDown returns and a held-back message is applied.
 func TestPrefixHandlerWaitsAtTheMaximumHeldBack(t *testing.T) {
 	t.Parallel()
 	h := newPrefixHandler(newMockStore(), logger.New(),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	h.peerDownMu.Lock()
 	h.HandleMessage(sessionDown())
 	held := peerAnnouncement(testPeerIP, testV6Prefix)
 	for range maxHeldBackMessages {
 		h.HandleMessage(held)
 	}
 	returned := make(chan struct{})
 	go func() {
 		h.HandleMessage(peerAnnouncement(secondPeerIP, otherV4Prefix))
 		close(returned)
 	}()
 	select {
 	case <-returned:
 		t.Error("HandleMessage returned while maxHeldBackMessages messages " +
 			"were held back")
 	case <-time.After(stillWaitingAfter):
 	}
 	h.peerDownMu.Unlock()
 	select {
 	case <-returned:
 	case <-time.After(stepTimeout):
 		t.Fatal("HandleMessage did not return after the PeerDown returned")
 	}
 }
 // slowWriter takes a millisecond over each write and drops what it is given.
 // It closes firstWrite at the first write.
 type slowWriter struct {
 	firstWrite chan struct{}
 	once       sync.Once
 }
 func (w *slowWriter) Write(p []byte) (int, error) {
 	w.once.Do(func() { close(w.firstWrite) })
 	time.Sleep(time.Millisecond)
 	return len(p), nil
 }
 // TestPrefixHandlerAppliesAPathWithoutAnOriginToTheRoutingTable hands the
 // prefix handler announcements whose AS path gives no origin. One whose path
 // is empty or holds AS 0 removes the peer's route, as a withdrawal does; one
@@ -423,9 +199,8 @@ func TestPrefixHandlerKeepsThePathOfAPathEndingInASet(t *testing.T) {
 	}
 }
-// checkTableCases hands the messages of each case to a new prefix handler. It
+// checkTableCases hands the messages of each case to a new prefix handler and
-// checks the handler's routing table once the handler's PeerDowns have
+// checks its routing table right after, with no flush.
 // returned, with no flush.
 func checkTableCases(t *testing.T, tests []tableCase) {
 	t.Helper()
@@ -438,28 +213,17 @@ func checkTableCases(t *testing.T, tests []tableCase) {
 				h.HandleMessage(msg)
 			}
-			h.peerDowns.Wait()
+			for prefix, want := range tt.want {
-			checkTableOrigins(t, h.table, tt.want)
+				got := tableOrigins(h.table, prefix)
 				if !reflect.DeepEqual(got, want) {
 					t.Errorf("peers of %s by origin AS = %v, want %v",
 						prefix, got, want)
 				}
 			}
 		})
 	}
 }
 // checkTableOrigins checks, for each prefix in want, the peers that carry it
 // in table with each origin AS.
 func checkTableOrigins(
 	t *testing.T, table *routetable.Table, want map[string]map[int][]string,
 ) {
 	t.Helper()
 	for prefix, wantOrigins := range want {
 		got := tableOrigins(table, prefix)
 		if !reflect.DeepEqual(got, wantOrigins) {
 			t.Errorf("peers of %s by origin AS = %v, want %v",
 				prefix, got, wantOrigins)
 		}
 	}
 }
 // tableWritesStore is a real database that hands each write of the routing
 // table's changes to written once it is made.
 type tableWritesStore struct {
@@ -734,7 +498,6 @@ func TestARestartReadsTheRoutingTableBack(t *testing.T) {
 		h.HandleMessage(msg)
 	}
 	h.peerDowns.Wait()
 	h.flushBatch()
 	var logs bytes.Buffer
@@ -773,7 +536,6 @@ func TestARestartReadsTheRoutingTableBack(t *testing.T) {
 		restarted.HandleMessage(msg)
 	}
 	h.peerDowns.Wait()
 	restarted.Stop(t.Context())
 	read, err := db.ReadRouteTable(t.Context())
@@ -12,7 +12,6 @@ import (
 	"regexp"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 	"unicode/utf8"
@@ -71,12 +70,12 @@ const nicbrHeader = "% Copyright (c) Nic.br"
 // queries to stop the data being taken in bulk.
 const nicbrLimitReached = "Query rate limit exceeded"
-// PauseTime is how long the client sends an RIR's or NIC.br's server no
+// NICbrSkipTime is how long the client stops asking NIC.br after NIC.br
-// query after that server refuses a query. queryRegistry says what a
+// answers that the client is over its query limit. NIC.br publishes
-// refusal is. RIPE refuses an address for good when the address keeps
+// neither the limit nor how long it lasts. An hour outlasts a limit
-// passing RIPE's limit (see noPersonalFlag). An hour outlasts a limit
+// counted per minute or per hour. The ASes looked up meanwhile get
-// counted per minute or per hour.
+// NIC.br's fields when they are next refreshed.
-const PauseTime = time.Hour
+const NICbrSkipTime = time.Hour
 // RIR identifiers.
 const (
@@ -126,10 +125,6 @@ var (
 	errAnswerTooLarge = errors.New("WHOIS answer reached the size cap")
 )
 // ErrPaused is returned when a lookup needs a server that refused a query
 // less than PauseTime ago. The client sends that server nothing meanwhile.
 var ErrPaused = errors.New("WHOIS server paused after refusing a query")
 // ASNInfo contains parsed WHOIS information for an ASN.
 type ASNInfo struct {
 	ASN         int
@@ -161,12 +156,12 @@ type Client struct {
 	logger *slog.Logger
-	// mu guards pausedUntil.
+	// mu guards nicbrSkipUntil.
 	mu sync.Mutex
-	// pausedUntil maps a server, given as host:port, to the time the client
+	// nicbrSkipUntil is when the client next asks NIC.br, after NIC.br
-	// may ask it again.
+	// answered that the client is over its query limit.
-	pausedUntil map[string]time.Time
+	nicbrSkipUntil time.Time
 }
 // NewClient creates a new WHOIS client that logs to logger.
@@ -177,29 +172,23 @@ func NewClient(logger *slog.Logger) *Client {
 		DialContext: dialer.DialContext,
 		Now:         time.Now,
 		logger:      logger,
 		pausedUntil: make(map[string]time.Time),
 	}
 }
 // LookupASN asks IANA which RIR holds the given ASN, asks that RIR, and
 // returns what the RIR's answer says. When LACNIC's answer is NIC.br's, it
 // returns what NIC.br's own server says instead, unless that query fails or
-// NIC.br is paused, as askNICbr says.
+// is skipped, as askNICbr says.
 //
-// It returns ErrNoReferral when IANA refers the AS to no RIR. Its error
+// It returns ErrNoReferral when IANA refers the AS to no RIR, and another
-// wraps ErrPaused when the RIR is paused. It returns another error in each
+// error when the query to IANA or to the RIR fails, when the RIR refuses
-// of these cases:
+// it, when IANA's answer has neither a referral nor the AS's block, when
-//
+// IANA refers the AS to a server none of the five RIRs run, or when the
-//   - the query to IANA or to the RIR fails
+// answer carries none of ASNInfo's fields.
 //   - the RIR refuses the query
 //   - IANA's answer has neither a referral nor the AS's block
 //   - IANA refers the AS to a server none of the five RIRs run
 //   - the answer carries none of ASNInfo's fields
 func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	// Query IANA first to find the authoritative RIR
 	query := fmt.Sprintf("AS%d", asn)
 	// IANA is never paused, because a pause of IANA would stop every lookup.
 	ianaResp, err := c.query(ctx, whoisServerIANA, query)
 	if err != nil {
 		return nil, fmt.Errorf("IANA query failed: %w", err)
@@ -222,7 +211,7 @@ func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	}
 	// Query the authoritative RIR
-	rirResp, err := c.queryRegistry(ctx, whoisServer, rirQuery(rir, query))
+	rirResp, err := c.queryRIR(ctx, whoisServer, rirQuery(rir, query))
 	if err != nil {
 		return nil, fmt.Errorf("RIR query failed: %w", err)
 	}
@@ -252,19 +241,22 @@ func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 // askNICbr returns lacnicInfo, what LACNIC's answer says, and logs a
 // warning when the query fails, when NIC.br sends the reduced answer for a
 // client over its limit, or when NIC.br's answer carries none of ASNInfo's
-// fields. The reduced answer pauses NIC.br, as a refusal does. While NIC.br
+// fields. After the reduced answer, it returns lacnicInfo without asking
-// is paused, askNICbr returns lacnicInfo without a warning. The ASes looked
+// NIC.br until NICbrSkipTime has passed.
 // up meanwhile get NIC.br's fields when they are next refreshed.
 func (c *Client) askNICbr(
 	ctx context.Context, asQuery string, lacnicInfo *ASNInfo,
 ) *ASNInfo {
 	asn := lacnicInfo.ASN
-	answer, err := c.queryRegistry(ctx, whoisServerNICbr, asQuery)
+	c.mu.Lock()
-	if errors.Is(err, ErrPaused) {
+	skipping := c.Now().Before(c.nicbrSkipUntil)
 	c.mu.Unlock()
 	if skipping {
 		return lacnicInfo
 	}
 	answer, err := c.query(ctx, whoisServerNICbr, asQuery)
 	if err != nil {
 		c.logger.Warn("NIC.br query failed, keeping LACNIC's fields",
 			"asn", asn, "error", err)
@@ -273,11 +265,13 @@ func (c *Client) askNICbr(
 	}
 	if strings.Contains(answer, nicbrLimitReached) {
-		c.pause(whoisServerNICbr)
+		c.mu.Lock()
 		c.nicbrSkipUntil = c.Now().Add(NICbrSkipTime)
 		c.mu.Unlock()
 		c.logger.Warn("NIC.br answered that the client is over its query "+
-			"limit, keeping LACNIC's fields and pausing NIC.br",
+			"limit, keeping LACNIC's fields and skipping NIC.br",
-			"asn", asn, "pause_for", PauseTime)
+			"asn", asn, "skip_for", NICbrSkipTime)
 		return lacnicInfo
 	}
@@ -315,65 +309,25 @@ func rirQuery(rir, asQuery string) string {
 	}
 }
-// queryRegistry sends query to the server of an RIR or of NIC.br, and
+// queryRIR sends query to an RIR's server and returns the answer. An answer
-// returns the answer. The client pauses the server for PauseTime when the
+// holding an error line with which the server refuses the query is an
-// server refuses the query. Each of these is a refusal:
+// error, and the error holds that line.
-//
+func (c *Client) queryRIR(
 //   - a refused connection
 //   - a reset connection
 //   - an %ERROR:201: or %ERROR:202: line in the answer
 //
 // A refusal is returned as an error. While the server is paused,
 // queryRegistry sends it nothing and returns an error that wraps ErrPaused.
 func (c *Client) queryRegistry(
 	ctx context.Context, server, query string,
 ) (string, error) {
 	c.mu.Lock()
 	pausedUntil := c.pausedUntil[server]
 	c.mu.Unlock()
 	if c.Now().Before(pausedUntil) {
 		return "", fmt.Errorf("%w: %s until %s", ErrPaused, server,
 			pausedUntil.UTC().Format(time.RFC3339))
 	}
 	answer, err := c.query(ctx, server, query)
 	if err == nil {
 		err = checkRefusal(answer)
 	}
 	if errors.Is(err, errRefused) || errors.Is(err, syscall.ECONNREFUSED) ||
 		errors.Is(err, syscall.ECONNRESET) {
 		c.pause(server)
 	}
 	if err != nil {
 		return "", err
 	}
 	return answer, nil
 }
 // checkRefusal returns an error holding the first line of answer that
 // starts with accessDeniedError or accessLimitError. It returns nil when
 // answer has no such line.
 func checkRefusal(answer string) error {
 	for line := range strings.SplitSeq(answer, "\n") {
 		if strings.HasPrefix(line, accessDeniedError) ||
 			strings.HasPrefix(line, accessLimitError) {
-			return fmt.Errorf("%w: %s", errRefused, line)
+			return "", fmt.Errorf("%w: %s", errRefused, line)
 		}
 	}
-	return nil
+	return answer, nil
 }
 // pause stops queryRegistry from querying server until PauseTime has passed.
 func (c *Client) pause(server string) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.pausedUntil[server] = c.Now().Add(PauseTime)
 }
 // query performs a raw WHOIS query to the specified server and returns the
@@ -718,10 +718,9 @@ func TestLookupASNKeepsLACNICsAnswerWhenNICbrFails(t *testing.T) {
 // TestLookupASNSkipsNICbrAfterItsLimit looks up an AS that NIC.br
 // registers three times with one client, while NIC.br answers that the
-// client is over its query limit. The test sets the client's clock. The
+// client is over its query limit. The first lookup asks NIC.br. The
-// first lookup asks NIC.br. The next comes a second before PauseTime has
+// second, a second before NICbrSkipTime has passed, does not. The third,
-// passed, and does not ask NIC.br. The last comes at PauseTime and asks
+// once NICbrSkipTime has passed, asks again. Each keeps LACNIC's fields.
 // NIC.br again. Each keeps LACNIC's fields.
 func TestLookupASNSkipsNICbrAfterItsLimit(t *testing.T) {
 	t.Parallel()
@@ -741,8 +740,8 @@ func TestLookupASNSkipsNICbrAfterItsLimit(t *testing.T) {
 		wantAsks int
 	}{
 		{after: 0, wantAsks: 1},
-		{after: whois.PauseTime - time.Second, wantAsks: 1},
+		{after: whois.NICbrSkipTime - time.Second, wantAsks: 1},
-		{after: whois.PauseTime, wantAsks: 2},
+		{after: whois.NICbrSkipTime, wantAsks: 2},
 	} {
 		now = start.Add(step.after)
@@ -786,142 +785,6 @@ func TestLookupASNReportsARefusal(t *testing.T) {
 	}
 }
 // resetServer starts a TCP server on the loopback address and returns the
 // server's address. The server reads one query on each connection, then
 // resets the connection.
 func resetServer(t *testing.T) string {
 	t.Helper()
 	var listenConfig net.ListenConfig
 	listener, err := listenConfig.Listen(t.Context(), "tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}
 	t.Cleanup(func() { _ = listener.Close() })
 	go func() {
 		for {
 			conn, err := listener.Accept()
 			if err != nil {
 				return
 			}
 			_, _ = bufio.NewReader(conn).ReadString('\n')
 			// Closing a connection whose linger time is zero resets it.
 			if tcpConn, ok := conn.(*net.TCPConn); ok {
 				_ = tcpConn.SetLinger(0)
 			}
 			_ = conn.Close()
 		}
 	}()
 	return listener.Addr().String()
 }
 // newRIPEClient returns a client whose fake servers send answers. The
 // client adds one to *ripeAsks each time it connects to RIPE's server. When
 // reset is true, RIPE's server resets the connection instead of answering.
 func newRIPEClient(
 	t *testing.T, answers map[string]string, reset bool, ripeAsks *int,
 ) *whois.Client {
 	t.Helper()
 	dial := fakeServers(t, answers)
 	resetAddress := resetServer(t)
 	client := whois.NewClient(slog.New(slog.DiscardHandler))
 	client.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ripeServer {
 			*ripeAsks++
 		}
 		if address == ripeServer && reset {
 			var dialer net.Dialer
 			return dialer.DialContext(ctx, network, resetAddress)
 		}
 		return dial(ctx, network, address)
 	}
 	return client
 }
 // TestLookupASNPausesAServerThatRefuses looks up an AS at RIPE while RIPE
 // refuses the query, in each of the ways a server refuses. The test sets
 // the client's clock. A lookup a second before PauseTime has passed fails
 // with ErrPaused and asks RIPE nothing. A lookup of an AS at APNIC succeeds
 // during the pause. A lookup at PauseTime asks RIPE again.
 func TestLookupASNPausesAServerThatRefuses(t *testing.T) {
 	t.Parallel()
 	for name, test := range map[string]struct {
 		// ripeAnswer is RIPE's answer. With none, RIPE's server refuses
 		// the connection, or resets it when reset is true.
 		ripeAnswer string
 		reset      bool
 	}{
 		"access denied":      {ripeAnswer: ripeRefusal},
 		"limit reached":      {ripeAnswer: ripeLimitReached + "\n"},
 		"refused connection": {},
 		"reset connection":   {reset: true},
 	} {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			answers := map[string]string{
 				ianaQuery:      ianaReferral,
 				apnicIANAQuery: "refer:        whois.apnic.net\n",
 				apnicQuery:     apnicRecord,
 			}
 			if test.ripeAnswer != "" {
 				answers[ripeQuery] = test.ripeAnswer
 			}
 			ripeAsks := 0
 			client := newRIPEClient(t, answers, test.reset, &ripeAsks)
 			start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 			now := start
 			client.Now = func() time.Time { return now }
 			_, err := client.LookupASN(t.Context(), testASN)
 			if err == nil || errors.Is(err, whois.ErrPaused) {
 				t.Fatalf("LookupASN while RIPE refuses: error %v, want a "+
 					"refusal", err)
 			}
 			now = start.Add(whois.PauseTime - time.Second)
 			_, err = client.LookupASN(t.Context(), testASN)
 			if !errors.Is(err, whois.ErrPaused) || ripeAsks != 1 {
 				t.Errorf("LookupASN during the pause: error %v after %d "+
 					"queries to RIPE, want ErrPaused after 1", err, ripeAsks)
 			}
 			_, err = client.LookupASN(t.Context(), apnicASN)
 			if err != nil {
 				t.Errorf("LookupASN of an AS at APNIC during RIPE's "+
 					"pause: %v", err)
 			}
 			now = start.Add(whois.PauseTime)
 			_, _ = client.LookupASN(t.Context(), testASN)
 			if ripeAsks != 2 {
 				t.Errorf("RIPE was asked %d times after the pause, want 2",
 					ripeAsks)
 			}
 		})
 	}
 }
 // TestLookupASNFailsWhenTheRIRGivesNoAnswer looks up an AS IANA refers to
 // RIPE when RIPE's server refuses the connection, and when it answers only
 // with an error. Neither is a lookup that found the AS.