Skip to content

kv: avoid race in txnSpanRefresher.SendLocked#53275

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/fixSpanRefresh
Aug 22, 2020
Merged

kv: avoid race in txnSpanRefresher.SendLocked#53275
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/fixSpanRefresh

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Aug 22, 2020

Fixes #53249.

The race was caused by the reintroduction of DeprecatedCanCommitAtHigherTimestamp
in #53220, mixed with the new splitEndTxnAndRetrySend logic introduced in #52885.

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.
@nvb nvb requested a review from andreimatei August 22, 2020 19:19
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @andreimatei)

Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andreimatei)

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Aug 22, 2020

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 22, 2020

Build succeeded:

@craig craig bot merged commit 7425e85 into cockroachdb:master Aug 22, 2020
@nvb nvb deleted the nvanbenschoten/fixSpanRefresh branch August 24, 2020 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

kv/kvserver: TestReplicateQueueDownReplicate failed

3 participants