engine: use Txn.Timestamp instead of OrigTimestamp for LogLogicalOp#28970
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Aug 22, 2018
Merged
engine: use Txn.Timestamp instead of OrigTimestamp for LogLogicalOp#28970craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
The `OrigTimestamp` was being used to give a timestamp to the txn in the logical op log because that is the timestamp the intent is written at. However, the intent can't actually commit until its `Timestamp`. This was causing issues with closed timestamps, which forwards the `Txn.Timestamp` but don't affect the `OrigTimestamp`. Without this change we were hitting an assertion in the rangefeed package where a new intent looked like it was below the resolved timestamp. Release note: None
Member
|
This change is |
tbg
approved these changes
Aug 22, 2018
Member
tbg
left a comment
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 0 of 0 LGTMs obtained (and 1 stale)
Contributor
Author
|
TFTR! bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Aug 22, 2018
28970: engine: use Txn.Timestamp instead of OrigTimestamp for LogLogicalOp r=nvanbenschoten a=nvanbenschoten The `OrigTimestamp` was being used to give a timestamp to the txn in the logical op log because that is the timestamp the intent is written at. However, the intent can't actually commit until its `Timestamp`. This was causing issues with closed timestamps, which forwards the `Txn.Timestamp` but don't affect the `OrigTimestamp`. Without this change we were hitting an assertion in the rangefeed package where a new intent looked like it was below the resolved timestamp. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Contributor
Build succeeded |
craig bot
pushed a commit
that referenced
this pull request
Sep 4, 2018
29500: release-2.1: backport 7 rangefeed PRs r=nvanbenschoten a=nvanbenschoten Backport: * 5/5 commits from "kv: give Transport a haircut" (#28855) * 1/1 commits from "engine: use Txn.Timestamp instead of OrigTimestamp for LogLogicalOp" (#28970) * 1/1 commits from "rangefeed: add release valve to logical op consumption" (#29076) * 3/3 commits from "kv: teach DistSender about RangeFeeds, use for changefeeds" (#28912) * 1/1 commits from "rangefeed: small perf-related changes" (#29134) * 2/2 commits from "kv: truncate RangeFeed span to range descriptor " (#29219) * 2/2 commits from "storage: hook closed timestamps into rangefeed" (#28974) Please see individual PRs for details. All cherry-picks were clean. /cc @cockroachdb/release 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.
The
OrigTimestampwas being used to give a timestamp to thetxn in the logical op log because that is the timestamp the
intent is written at. However, the intent can't actually
commit until its
Timestamp. This was causing issues withclosed timestamps, which forwards the
Txn.Timestampbut don'taffect the
OrigTimestamp. Without this change we were hittingan assertion in the rangefeed package where a new intent looked
like it was below the resolved timestamp.
Release note: None