sql/row: avoid NegotiateAndSend on a multi-batch request#69350
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Aug 26, 2021
Merged
sql/row: avoid NegotiateAndSend on a multi-batch request#69350craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
nvb
approved these changes
Aug 25, 2021
Contributor
nvb
left a comment
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @otan)
pkg/sql/row/kv_fetcher.go, line 68 at r1 (raw file):
sendFn = func(ctx context.Context, ba roachpb.BatchRequest) (br *roachpb.BatchResponse, _ error) { ba.RoutingPolicy = roachpb.RoutingPolicy_NEAREST ba.BoundedStaleness = bsHeader
We don't want this, right? Won't this hit the assertion we just added on the Send path? Do we need a test that intentionally hits the Send path?
pkg/sql/row/kv_fetcher.go, line 75 at r1 (raw file):
if !negotiated { ba.BoundedStaleness = bsHeader br, pErr = txn.NegotiateAndSend(ctx, ba)
Do you mind opening an issue for me to add a test to txn_external_test.go that ensures that a bounded staleness read that returns a resume span still negotiates correctly and fixes the transaction timestamp?
Avoid the double NegotiateAndSend on a bounded staleness request if there are multiple column families for the given row by tracking whether a negotiate was already made. If so, use Send, as SetFixedTimestamp would already have the correct value. Release justification: fix to new feature Release note: None
05125ef to
d490a28
Compare
otan
commented
Aug 25, 2021
Contributor
Author
otan
left a comment
There was a problem hiding this comment.
Reviewable status:
pkg/sql/row/kv_fetcher.go, line 68 at r1 (raw file):
Previously, nvanbenschoten (Nathan VanBenschoten) wrote…
We don't want this, right? Won't this hit the assertion we just added on the Send path? Do we need a test that intentionally hits the Send path?
urgh! i rebased this wrong. my bad. this test would have failed (...flakily / under stress...)
Contributor
Author
|
bors r=nvanbenschoten |
Contributor
|
Build succeeded: |
nvb
added a commit
to nvb/cockroach
that referenced
this pull request
Aug 27, 2021
Fixes cockroachdb#69386. In cockroachdb#69350, we began relying on the previously unspecified behavior of Txn.NegotiateAndSend that negotiation was completed across all read spans in a request, even if the request itself was paginated. This commit clarifies this contract. It also adds client and server-side tests that exercise the behavior. Release justification: added testing for new functionality
nvb
added a commit
to nvb/cockroach
that referenced
this pull request
Aug 29, 2021
Fixes cockroachdb#69386. In cockroachdb#69350, we began relying on the previously unspecified behavior of Txn.NegotiateAndSend that negotiation was completed across all read spans in a request, even if the request itself was paginated. This commit clarifies this contract. It also adds client and server-side tests that exercise the behavior. Release justification: added testing for new functionality
craig bot
pushed a commit
that referenced
this pull request
Aug 29, 2021
69481: kv: specify + test behavior of NegotiateAndSend with paginated reads r=nvanbenschoten a=nvanbenschoten Fixes #69386. In #69350, we began relying on the previously unspecified behavior of Txn.NegotiateAndSend that negotiation was completed across all read spans in a request, even if the request itself was paginated. This commit clarifies this contract. It also adds client and server-side tests that exercise the behavior. Release justification: added testing for new functionality 69489: roachtest/follower-reads: adopt bounded staleness reads r=nvanbenschoten a=nvanbenschoten This commit expands the existing `follower-reads` roachtest with four new variants: - `follower-reads/survival=region/locality=global/reads=bounded-staleness` - `follower-reads/survival=region/locality=regional/reads=bounded-staleness` - `follower-reads/survival=zone/locality=global/reads=bounded-staleness` - `follower-reads/survival=zone/locality=regional/reads=bounded-staleness` As the names indicate, these four variants perform bounded staleness reads over different cluster topologies and assert that the reads are served from follower replicas. Release note: None Release justification: testing only Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Avoid the double NegotiateAndSend on a bounded staleness request if
there are multiple column families for the given row by tracking
whether a negotiate was already made. If so, use Send, as
SetFixedTimestamp would already have the correct value.
Release justification: fix to new feature
Resolves: #69063
Release note: None