Skip to content

kv: small readability improvement to the heartbeat#44461

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:kv.heartbeat-race
Jan 28, 2020
Merged

kv: small readability improvement to the heartbeat#44461
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:kv.heartbeat-race

Conversation

@andreimatei
Copy link
Copy Markdown
Contributor

Rearrange protection against a race to make it more obvious. A casual
reading suggested to me that this protection was missing.

Release note: None

Rearrange protection against a race to make it more obvious. A casual
reading suggested to me that this protection was missing.

Release note: None
@andreimatei andreimatei requested a review from nvb January 28, 2020 21:43
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@andreimatei
Copy link
Copy Markdown
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request Jan 28, 2020
44429: sql: propagate row-level locking modes through execbuilder to row.Fetcher r=nvanbenschoten a=nvanbenschoten

Relates to #40205.

This commit is a follow-up to #44015. It propagates the row-level locking modes
from the optbuilder all the way down to the row.Fetcher. This requires passing
the locking information through the execbuilder and then through DistSQL. The
commit leaves off at the point where `roachpb.ScanRequest`s are constructed.

I couldn't find a good way to test this. It's possible I missed something and
would love any tips, but I think we may need to wait until the plumbing into
the KV API is complete before performing end-to-end tests.

The next step will be to hook the locking modes into the KV API.

Release note: None

44446: roachtest: don't use 20.1 nodelocal on older versions r=dt a=dt

The ability to target the nodelocal directory *of a particular node* was added in 20.1,
so when roachtesting earlier versions we still need to use the old google cloud storage bucket.

Release note: none.

44461: kv: small readability improvement to the heartbeat r=andreimatei a=andreimatei

Rearrange protection against a race to make it more obvious. A casual
reading suggested to me that this protection was missing.

Release note: None

44463: kv: simplify retriable error handling r=andreimatei a=andreimatei

The contract of handleRetryableErrLocked() was weird for no discernible
reason.

Release note: None

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Co-authored-by: David Taylor <tinystatemachine@gmail.com>
Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 28, 2020

Build succeeded

@craig craig bot merged commit aefa080 into cockroachdb:master Jan 28, 2020
@andreimatei andreimatei deleted the kv.heartbeat-race branch January 29, 2020 18:21
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.

3 participants