Skip to content

Commit

Permalink
Merge #77373
Browse files Browse the repository at this point in the history
77373: ccl/serverccl/statusccl: increase test timeout for tenant txn id resolution r=maryliag a=Azhng

Hopefully resolves #77371

Previously, Txn ID Resolution test for tenant allowed retries for up to
three seconds. However, since tenant RPC fanout depended on range feed
to populate its internal cache, it might take more than three seconds
for the sqlinstance system to properly update its internal cache. This
might be the root cause of #77371.
This commit relaxes the retry constraints for the Txn ID Resolution test.

Release justification: bug fix to existing functionality
Release note: None

Co-authored-by: Azhng <archer.xn@gmail.com>
  • Loading branch information
craig[bot] and Azhng committed Mar 4, 2022
2 parents f344d07 + 5b275c6 commit 0e1edf3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/ccl/serverccl/statusccl/tenant_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ func testTxnIDResolutionRPC(ctx context.Context, t *testing.T, helper *tenantTes
"expected a valid txnID, but %+v is found", result)
sqlConn.Exec(t, "COMMIT")

testutils.SucceedsWithin(t, func() error {
testutils.SucceedsSoon(t, func() error {
resp, err := status.TxnIDResolution(ctx, &serverpb.TxnIDResolutionRequest{
CoordinatorID: strconv.Itoa(int(coordinatorNodeID)),
TxnIDs: []uuid.UUID{txnID},
Expand All @@ -964,7 +964,7 @@ func testTxnIDResolutionRPC(ctx context.Context, t *testing.T, helper *tenantTes
"was not", txnID.String(), coordinatorNodeID)
require.NotEqual(t, roachpb.InvalidTransactionFingerprintID, resp.ResolvedTxnIDs[0].TxnFingerprintID)
return nil
}, 3*time.Second)
})
}

t.Run("regular_cluster", func(t *testing.T) {
Expand Down

0 comments on commit 0e1edf3

Please sign in to comment.