Skip to content
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

kv: deflake TestTenantRateLimiter #70723

Merged
merged 1 commit into from
Sep 25, 2021
Merged

kv: deflake TestTenantRateLimiter #70723

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
15 changes: 10 additions & 5 deletions pkg/kv/kvserver/client_tenant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/encoding"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
Expand Down Expand Up @@ -143,7 +142,6 @@ func TestTenantsStorageMetricsOnSplit(t *testing.T) {
// and report the correct metrics.
func TestTenantRateLimiter(t *testing.T) {
defer leaktest.AfterTest(t)()
skip.WithIssue(t, 70456, "flaky test")
defer log.Scope(t).Close(t)

// This test utilizes manual time to make the rate-limiting calculations more
Expand All @@ -164,6 +162,10 @@ func TestTenantRateLimiter(t *testing.T) {
ctx := context.Background()
defer s.Stopper().Stop(ctx)

// Set a small rate limit so the test doesn't take a long time.
runner := sqlutils.MakeSQLRunner(sqlDB)
runner.Exec(t, `SET CLUSTER SETTING kv.tenant_rate_limiter.rate_limit = 200`)

tenantID := serverutils.TestTenantID()
codec := keys.MakeSQLCodec(tenantID)

Expand Down Expand Up @@ -224,8 +226,7 @@ func TestTenantRateLimiter(t *testing.T) {

// Create some tooling to read and verify metrics off of the prometheus
// endpoint.
sqlutils.MakeSQLRunner(sqlDB).Exec(t,
`SET CLUSTER SETTING server.child_metrics.enabled = true`)
runner.Exec(t, `SET CLUSTER SETTING server.child_metrics.enabled = true`)
httpClient, err := s.GetHTTPClient()
require.NoError(t, err)
getMetrics := func() string {
Expand All @@ -247,5 +248,9 @@ func TestTenantRateLimiter(t *testing.T) {

// Ensure that the metric for the admitted requests reflects the number of
// admitted requests.
require.Contains(t, getMetrics(), makeMetricStr(int64(tooManyWrites)))
// TODO(radu): this is fragile because a background write could sneak in and
// the count wouldn't match exactly.
m := getMetrics()
exp := makeMetricStr(int64(tooManyWrites))
require.Contains(t, m, exp, "could not find %s in metrics: \n%s\n", exp, m)
}