Skip to content

kv/bulk: pull lastRange out of mu and always pass monitor#80467

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
dt:lastrange
Apr 25, 2022
Merged

kv/bulk: pull lastRange out of mu and always pass monitor#80467
craig[bot] merged 2 commits intocockroachdb:masterfrom
dt:lastrange

Conversation

@dt
Copy link
Copy Markdown
Contributor

@dt dt commented Apr 25, 2022

Follow-up work from #79967.

Pulling lastRange out of the mutex and only updating it on sync flushes simplifies the locking since we don't need its result anyway for range-flushes (as we flushed because were done with that range).

Additionally, the original patch added a mem monitor and used it unconditionally, however some external creators of batcher (restore, stream ingest) make their own batchers and were not populating it. Second commit fixes that.

@dt dt requested review from nvb and stevendanna April 25, 2022 11:53
@dt dt requested a review from a team as a code owner April 25, 2022 11:53
@dt dt requested a review from a team April 25, 2022 11:53
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@nvb nvb left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r1, 3 of 3 files at r2, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stevendanna)

@dt
Copy link
Copy Markdown
Contributor Author

dt commented Apr 25, 2022

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 25, 2022

Build succeeded:

@craig craig bot merged commit be3c18e into cockroachdb:master Apr 25, 2022
@dt dt deleted the lastrange branch April 25, 2022 16:38
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