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: distsql: create LeafTxn eagerly for local flow of a distributed plan #82841

Merged
merged 1 commit into from
Jun 13, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 13, 2022

Backport 1/1 commits from #82829 on behalf of @yuzefovich.

/cc @cockroachdb/release


This commit makes it so that we eagerly create LeafTxns for local flows
of distributed plans. I believe it was an oversight in d6077d5
(added during 21.2 release cycle) where we started creating LeafTxns
eagerly when the local flow has concurrency. We can do the same thing
for local flows of distributed queries since we know that they must use
LeafTxns anyway.

This oversight was recently exposed by 6c88496
where some processors began storing the txn internally, rather than
accessing it from the flow context. The thing is that we do update the
references to the correct txn from the flow context, but it is done
after the flow setup has been complete, at which point some processors
might have already captured the wrong txn. In particular, this is the
case for a local flow of a distributed query with index / lookup joins
when the streamer API is disabled.

Fixes: #82775.
Fixes: #82776.
Fixes: #82777.
Fixes: #82783.

Release note: None


Release justification: bug fix.

This commit makes it so that we eagerly create LeafTxns for local flows
of distributed plans. I believe it was an oversight in d6077d5
(added during 21.2 release cycle) where we started creating LeafTxns
eagerly when the local flow has concurrency. We can do the same thing
for local flows of distributed queries since we know that they must use
LeafTxns anyway.

This oversight was recently exposed by 6c88496
where some processors began storing the txn internally, rather than
accessing it from the flow context. The thing is that we do update the
references to the correct txn from the flow context, but it is done
_after_ the flow setup has been complete, at which point some processors
might have already captured the wrong txn. In particular, this is the
case for a local flow of a distributed query with index / lookup joins
when the streamer API is disabled.

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.1-82829 branch from e753881 to a35d068 Compare June 13, 2022 18:52
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 13, 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?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 13, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@michae2 michae2 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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rharding6373)

@yuzefovich yuzefovich merged commit e9f2b09 into release-22.1 Jun 13, 2022
@yuzefovich yuzefovich deleted the blathers/backport-release-22.1-82829 branch June 13, 2022 19:47
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.

3 participants