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

Jump to bottom

release-22.2: pkg/ccl: Unskip TestTenantStatusAPI/tenant_ranges/pagination #106632

Closed
wants to merge 1 commit into from
Closed

release-22.2: pkg/ccl: Unskip TestTenantStatusAPI/tenant_ranges/pagination #106632

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
39 changes: 27 additions & 12 deletions pkg/ccl/serverccl/statusccl/tenant_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,6 @@ func testTenantRangesRPC(_ context.Context, t *testing.T, helper serverccl.Tenan
})

t.Run("test tenant ranges pagination", func(t *testing.T) {
skip.UnderStressWithIssue(t, 92382)
ctx := context.Background()
resp1, err := tenantA.TenantRanges(ctx, &serverpb.TenantRangesRequest{
Limit: 1,
Expand All @@ -1180,18 +1179,34 @@ func testTenantRangesRPC(_ context.Context, t *testing.T, helper serverccl.Tenan
require.Len(t, ranges.Ranges, 1)
}

resp2, err := tenantA.TenantRanges(ctx, &serverpb.TenantRangesRequest{
Limit: 1,
Offset: resp1.Next,
sql := helper.TestCluster().TenantConn(0)
// Wait for the split queue to process some before requesting the 2nd range.
// We expect an offset for the 3rd range, so wait until at least 3 ranges exist.
testutils.SucceedsSoon(t, func() error {
res := sql.QueryStr(t, "SELECT count(*) FROM crdb_internal.ranges")
require.Equal(t, len(res), 1)
require.Equal(t, len(res[0]), 1)
rangeCount, err := strconv.Atoi(res[0][0])
require.NoError(t, err)
if rangeCount < 3 {
return errors.Newf("expected >= 3 ranges, got %d", rangeCount)
}

resp2, err := tenantA.TenantRanges(ctx, &serverpb.TenantRangesRequest{
Limit: 1,
Offset: resp1.Next,
})
require.NoError(t, err)
require.Equal(t, 2, int(resp2.Next))
for locality, ranges := range resp2.RangesByLocality {
require.Len(t, ranges.Ranges, 1)
// Verify pagination functions based on ascending RangeID order.
require.True(t,
resp1.RangesByLocality[locality].Ranges[0].RangeID < ranges.Ranges[0].RangeID)
}
return nil
})
require.NoError(t, err)
require.Equal(t, 2, int(resp2.Next))
for locality, ranges := range resp2.RangesByLocality {
require.Len(t, ranges.Ranges, 1)
// Verify pagination functions based on ascending RangeID order.
require.True(t,
resp1.RangesByLocality[locality].Ranges[0].RangeID < ranges.Ranges[0].RangeID)
}

})
}

Expand Down