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.

Sign up for GitHub

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

Jump to bottom

release-22.2: descs: fix txn commit waiting on wrong lease version #87755

Merged
merged 1 commit into from
Sep 12, 2022
Merged

release-22.2: descs: fix txn commit waiting on wrong lease version #87755

merged 1 commit into from
Sep 12, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 9, 2022

Backport 1/1 commits from #87706 on behalf of @postamar.

/cc @cockroachdb/release

Recent work on the descs.Collection (PR #87067) introduced a regression
in which it would return bad lease.IDVersion versions for the uncommitted
descriptors.

Fixes #87672.

Release justification: important bug fix
Release note: None

Release justification:

descs: fix txn commit waiting on wrong lease version
dab432a 
Recent work on the descs.Collection (PR #87067) introduced a regression
in which it would return bad lease.IDVersion versions for the uncommitted
descriptors.

In addition to fixing this, this commit corrects the lifecycle of the
`original` descriptors in the uncommitted layer, which now remain
unaffected by changes in the storage layer.

This commit tightens the constraints on what can be passed to
AddUncommittedDescriptor.

Fixes #87672.

Release justification: important bug fix
Release note: None
@blathers-crl blathers-crl bot requested a review from a team September 9, 2022 21:11
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-87706 branch from 62cbcf5 to dab432a Compare September 9, 2022 21:11
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 9, 2022 •
edited by postamar
Loading

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?

@blathers-crl blathers-crl bot requested review from ajwerner and postamar September 9, 2022 21:11
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 9, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

ajwerner
ajwerner approved these changes Sep 9, 2022
View reviewed changes
Copy link
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 @postamar)

@ajwerner ajwerner merged commit cf3d0e1 into release-22.2 Sep 12, 2022
@ajwerner ajwerner deleted the blathers/backport-release-22.2-87706 branch September 12, 2022 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajwerner ajwerner ajwerner approved these changes

@postamar postamar Awaiting requested review from postamar

Assignees

@postamar postamar

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @ajwerner @postamar