Skip to content

release-25.3: kvserver: deflake TestTenantCtx #158686

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

Open
wants to merge 1 commit into
base: release-25.3
Choose a base branch
from
+10 −1
Open

release-25.3: kvserver: deflake TestTenantCtx #158686

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
11 changes: 10 additions & 1 deletion pkg/kv/kvserver/client_tenant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,17 @@ func TestTenantCtx(t *testing.T) {
// context looks as expected, and signal their channels.

tenID, isTenantRequest := roachpb.ClientTenantFromContext(ctx)
keyRecognized := strings.Contains(ba.Requests[0].GetInner().Header().Key.String(), magicKey)
key := ba.Requests[0].GetInner().Header().Key
keyRecognized := strings.Contains(key.String(), magicKey)
if !keyRecognized {
return nil
}

// Skip meta2 range lookups as they don't carry tenant context.
if bytes.HasPrefix(key, keys.Meta2Prefix) {
return nil
}

var scanReq *kvpb.ScanRequest
var pushReq *kvpb.PushTxnRequest
if isSingleScan := ba.IsSingleRequest() && ba.Requests[0].GetInner().Method() == kvpb.Scan; isSingleScan {
Expand All @@ -431,6 +437,9 @@ func TestTenantCtx(t *testing.T) {
pushReq = ba.Requests[0].GetInner().(*kvpb.PushTxnRequest)
}

t.Logf("received request with key: %s, isTenantRequest: %t, tenID: %d",
key.String(), isTenantRequest, tenID)

switch {
case scanReq != nil:
var err error
Expand Down