Skip to content

kvserver: deflake TestConsistencyQueueRecomputeStats #137044

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
craig merged 1 commit into from
Dec 10, 2024
Merged

kvserver: deflake TestConsistencyQueueRecomputeStats #137044

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
31 changes: 19 additions & 12 deletions pkg/kv/kvserver/consistency_queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,18 +606,25 @@ func testConsistencyQueueRecomputeStatsImpl(t *testing.T, hadEstimates bool) {
t.Fatal(err)
}

// Force a run of the consistency queue, otherwise it might take a while.
store := tc.GetFirstStoreFromServer(t, 0)
require.NoError(t, store.ForceConsistencyQueueProcess())

// The stats should magically repair themselves. We'll first do a quick check
// and then a full recomputation.
repl, _, err := tc.Servers[0].GetStores().(*kvserver.Stores).GetReplicaForRangeID(ctx, rangeID)
require.NoError(t, err)
ms := repl.GetMVCCStats()
if ms.SysCount >= sysCountGarbage {
t.Fatalf("still have a SysCount of %d", ms.SysCount)
}
// When running with leader leases, it might take an extra election interval
// for a lease to be established after adding the voters above because the
// leader needs to get store liveness support from the followers. The stats
// re-computation runs on the leaseholder and will fail if there isn't one.
testutils.SucceedsSoon(t, func() error {
// Force a run of the consistency queue, otherwise it might take a while.
store := tc.GetFirstStoreFromServer(t, 0)
require.NoError(t, store.ForceConsistencyQueueProcess())

// The stats should magically repair themselves. We'll first do a quick check
// and then a full recomputation.
repl, _, err := tc.Servers[0].GetStores().(*kvserver.Stores).GetReplicaForRangeID(ctx, rangeID)
require.NoError(t, err)
ms := repl.GetMVCCStats()
if ms.SysCount >= sysCountGarbage {
return errors.Newf("still have a SysCount of %d", ms.SysCount)
}
return nil
})

if delta := computeDelta(db0); delta != (enginepb.MVCCStats{}) {
t.Fatalf("stats still in need of adjustment: %+v", delta)
Expand Down