sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-24 16:41:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[misc] Keep the repricing loop inside its own deadline

Browse Source 
The loop bounded when a new attempt could start, not how long one could
run. The chat container is capped at 90 seconds of its own and the row
lookup at another 20, so an attempt begun just inside the 180-second window
could report a repricing failure nearly two minutes after that window
closed. Run every call in the loop under a context that expires with the
deadline.
This commit is contained in:
mlsmaycon
2026-08-23 06:36:37 +00:00
parent acfad1a384
commit 427b4c8d41
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/agentnetwork/custom_pricing_test.go
View File

@@ -428,16 +428,23 @@ func TestPriceChangeUpdatesRecordedCost(t *testing.T) {
var lastCost float64
var sawRow bool
deadline := time.Now().Add(repriceDeadline)
// Everything inside the loop runs under the deadline rather than the
// test's own context. An attempt started just before it would otherwise
// run well past it: the chat container is capped at 90s of its own and the
// row lookup at another 20s, so the loop could report a repricing failure
// nearly two minutes after the window it was given had closed.
repriceCtx, cancelReprice := context.WithDeadline(ctx, deadline)
defer cancelReprice()
for time.Now().Before(deadline) {
lastSession = fmt.Sprintf("e2e-session-reprice-b-%d", time.Now().UnixNano())
code, _, cerr := env.client.Chat(ctx, env.endpoint, env.proxyIP, harness.WireChat, customModel, "Reply with exactly: pong", lastSession)
code, _, cerr := env.client.Chat(repriceCtx, env.endpoint, env.proxyIP, harness.WireChat, customModel, "Reply with exactly: pong", lastSession)
if cerr != nil || code != 200 {
if !waitBeforeRetry(ctx, 5*time.Second) {
if !waitBeforeRetry(repriceCtx, 5*time.Second) {
break
}
continue
}
row, ok := lookupAccessLogBySession(ctx, lastSession, repriceIngestWindow)
row, ok := lookupAccessLogBySession(repriceCtx, lastSession, repriceIngestWindow)
if !ok {
// No row for this request. The provider update rebuilds the proxy's
// middleware chain, and a request served mid-rebuild can complete
@@ -452,7 +459,7 @@ func TestPriceChangeUpdatesRecordedCost(t *testing.T) {
}
// Still priced at the old rate — the push hasn't landed yet; retry.
lastCost, sawRow = row.InputCostUsd, true
if !waitBeforeRetry(ctx, 5*time.Second) {
if !waitBeforeRetry(repriceCtx, 5*time.Second) {
break
}
}