Revert "kv: remove EndTxn.CanCommitAtHigherTimestamp flag"#53220
Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom Aug 22, 2020
Merged
Conversation
Fixes cockroachdb#53198. This reverts commit 93d5eb9. In cockroachdb#53198, we saw that v20.1 nodes still rely on v20.1 nodes properly setting this flag. That means that we can't remove it yet. Instead, all we can do is stop consulting it on the server so that we can remove it in v21.1.
Member
|
This change is |
andreimatei
approved these changes
Aug 21, 2020
Contributor
andreimatei
left a comment
There was a problem hiding this comment.
LGTM
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @andreimatei and @nvanbenschoten)
pkg/roachpb/api.proto, line 668 at r1 (raw file):
// TODO(nvanbenschoten): remove this in favor of can_forward_read_timestamp // in v21.1. bool can_commit_at_higher_timestamp = 8;
say that this flag is not read in 20.2 and name it deprecated_... ?
…stamp/ The field is now deprecated.
nvb
commented
Aug 21, 2020
Contributor
Author
nvb
left a comment
There was a problem hiding this comment.
Reviewable status:
pkg/roachpb/api.proto, line 668 at r1 (raw file):
Previously, andreimatei (Andrei Matei) wrote…
say that this flag is not read in 20.2 and name it
deprecated_...?
Done.
Contributor
Author
|
bors r+ |
Contributor
|
This PR was included in a batch that was canceled, it will be automatically retried |
Contributor
|
Build failed (retrying...): |
Contributor
|
Build succeeded: |
nvb
added a commit
to nvb/cockroach
that referenced
this pull request
Aug 22, 2020
Fixes cockroachdb#53249. The race was caused by the reintroduction of DeprecatedCanCommitAtHigherTimestamp in cockroachdb#53220, mixed with the new splitEndTxnAndRetrySend logic introduced in cockroachdb#52885.
craig bot
pushed a commit
that referenced
this pull request
Aug 22, 2020
53275: kv: avoid race in txnSpanRefresher.SendLocked r=nvanbenschoten a=nvanbenschoten Fixes #53249. The race was caused by the reintroduction of DeprecatedCanCommitAtHigherTimestamp in #53220, mixed with the new splitEndTxnAndRetrySend logic introduced in #52885. 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.
Fixes #53198.
This (partially) reverts commit 93d5eb9.
In #53198, we saw that v20.1 nodes still rely on v20.1 nodes properly
setting this flag. That means that we can't remove it yet. Instead,
all we can do is stop consulting it on the server so that we can
remove it in v21.1.