Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-22.1: kvserver: disable merge queue until kvsubscriber has updated #78190

Merged
merged 1 commit into from
Mar 22, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 21, 2022

Backport 1/1 commits from #78122 on behalf of @irfansharif.

/cc @cockroachdb/release


If we don't have any span configs available, enabling range merges would
be extremely dangerous -- we could collapse everything into a single
range. We've observed this happen when the kvsubscriber's initial scan
overflows its bounded buffer, preventing it from ever getting a
snapshot. A future commit will fix the bounded memory issue, but the
side-effect pointed out the need for this important safe guard.

Informs #77687.

Release justification: bug fix
Release note: None


Release justification:

If we don't have any span configs available, enabling range merges would
be extremely dangerous -- we could collapse everything into a single
range. We've observed this happen when the kvsubscriber's initial scan
overflows its bounded buffer, preventing it from ever getting a
snapshot. A future commit will fix the bounded memory issue, but the
side-effect pointed out the need for this important safe guard.

Informs #77687.

Release justification: bug fix
Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 21, 2022 17:18
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.1-78122 branch from 0d9961c to 5c99e1f Compare March 21, 2022 17:18
@blathers-crl blathers-crl bot requested review from ajwerner and arulajmani March 21, 2022 17:18
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 21, 2022
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 21, 2022

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

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

LGTM. Do you think we need similar protection in any of the other queues?

@irfansharif
Copy link
Contributor

The split queue will implicitly not be able to do anything, if the kvsubscriber doesn’t have data, the split queue doesn’t have any split points it can induce. Only other queue I can think of is maybe the MVCC GC queue and it not having protected timestamps installed by SQL. I’m not sure if holding up GC is the right solution there. @arulajmani, what do you think?

@irfansharif irfansharif merged commit ec0a78b into release-22.1 Mar 22, 2022
@irfansharif irfansharif deleted the blathers/backport-release-22.1-78122 branch March 22, 2022 03:14
@arulajmani
Copy link
Collaborator

I think it's okay to not hold up GC if protected timestamps haven't been reconciled. All our claims are for when protected timestamps are reconciled to KV, not when they're written in SQL, so we should be good.

@ajwerner
Copy link
Contributor

But this happens after reconciliation

@arulajmani
Copy link
Collaborator

Ah right -- I'll send out a patch that doesn't allow GC-ing if PTS information isn't available.

@arulajmani
Copy link
Collaborator

#78300

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants