Skip to content

test(pool): idle-sweep tests wait for the sweep to finish before they end #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CMGS merged 1 commit into from
Oct 4, 2026
Merged

test(pool): idle-sweep tests wait for the sweep to finish before they end #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions sandboxd/pool/archive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,10 @@ func TestArchiveLifecycleRoundTrip(t *testing.T) {
id, token, origVM := sb.ID, sb.Token, sb.VMName

backdate(m, sb, 5*time.Second)
m.idleOnce(t.Context())
waitFor(t, func() bool { return hibernated(m) == 1 })
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Fatal("idle claim was not hibernated")
}

m.archiveOnce(t.Context())
waitFor(t, func() bool { return archivedCount(m) == 1 })
Expand Down Expand Up @@ -695,8 +697,7 @@ func TestIdleOnceSkipsArchived(t *testing.T) {
hibBefore := eng.hibernateCount()
backdate(m, sb, time.Hour)

m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if got := eng.hibernateCount(); got != hibBefore {
t.Errorf("idle sweep hibernated an archived claim: %d→%d", hibBefore, got)
}
Expand Down
51 changes: 29 additions & 22 deletions sandboxd/pool/idle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ func TestIdleOnceHibernatesPastThreshold(t *testing.T) {
m := newTestManager(t, eng, config.PoolSpec{PoolKey: testKey, Warm: 1, IdleHibernateSeconds: 1})
sb := mustClaim(t, m, testKey)

m.idleOnce(t.Context())
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("fresh claim hibernated before its threshold")
}

backdate(m, sb, 2*time.Second)
m.idleOnce(t.Context())
waitFor(t, func() bool { return hibernated(m) == 1 })
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Fatal("idle claim was not hibernated")
}

m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Error("second sweep disturbed the hibernated claim")
}
Expand All @@ -46,8 +47,7 @@ func TestIdleOncePolicyScope(t *testing.T) {

sb := mustClaim(t, m, testKey)
backdate(m, sb, time.Hour)
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("pooled key without the policy was idle-hibernated by the node default")
}
Expand All @@ -58,8 +58,10 @@ func TestIdleOncePolicyScope(t *testing.T) {
t.Fatalf("provision: %v", err)
}
backdate(m, sb2, time.Hour)
m.idleOnce(t.Context())
waitFor(t, func() bool { return hibernated(m) == 1 })
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Fatal("idle claim was not hibernated")
}
})
}

Expand All @@ -75,8 +77,7 @@ func TestActivityStampsBlockIdleSweep(t *testing.T) {
t.Fatalf("WakeAgentSocket: %v", err)
}
done()
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("active claim hibernated despite a fresh data-plane stamp")
}
Expand All @@ -94,22 +95,22 @@ func TestHeldConnectionBlocksIdleSweep(t *testing.T) {
}

backdate(m, sb, time.Hour)
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("claim with an open connection was idle-hibernated")
}

done()
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("idle clock did not restart when the connection closed")
}

backdate(m, sb, 2*time.Second)
m.idleOnce(t.Context())
waitFor(t, func() bool { return hibernated(m) == 1 })
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Fatal("idle claim was not hibernated")
}
})
}

Expand Down Expand Up @@ -141,8 +142,7 @@ func TestEgressRequestInFlightBlocksIdleSweep(t *testing.T) {
}()
waitFor(t, sb.Busy)
backdate(m, sb, time.Hour)
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("claim with an egress request in flight was idle-hibernated")
}
Expand All @@ -152,14 +152,21 @@ func TestEgressRequestInFlightBlocksIdleSweep(t *testing.T) {
t.Fatalf("request through the proxy: %v", err)
}
waitFor(t, func() bool { return !sb.Busy() })
m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if hibernated(m) != 0 {
t.Fatal("idle clock did not restart when the egress request ended")
}
backdate(m, sb, time.Hour)
sweepIdle(t, m)
if hibernated(m) != 1 {
t.Fatal("idle claim was not hibernated")
}
}

func sweepIdle(t *testing.T, m *Manager) {
t.Helper()
m.idleOnce(t.Context())
waitFor(t, func() bool { return hibernated(m) == 1 })
waitFor(t, func() bool { return !m.idleSweep.Load() })
}

func backdate(m *Manager, sb *types.Sandbox, by time.Duration) {
Expand Down
3 changes: 1 addition & 2 deletions sandboxd/pool/volume_capture_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ func TestIdleOnceSkipsVolumeClaim(t *testing.T) {
sb.Volumes = []types.Volume{{Name: "dataset", Mount: "/datasets"}}
backdate(m, sb, 2*time.Second)

m.idleOnce(t.Context())
waitFor(t, func() bool { return !m.idleSweep.Load() })
sweepIdle(t, m)
if len(eng.hibernates) != 0 || hibernated(m) != 0 {
t.Errorf("idle sweep hibernated volume claim: engine=%v count=%d", eng.hibernates, hibernated(m))
}
Expand Down
Loading