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-23.2: sql: prevent illegal concurrency with internal executor in some cases #119184

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

yuzefovich
Copy link
Member

Backport 1/2 commits from #119176.

/cc @cockroachdb/release


Previously, it was possible for some methods of the internal executor result in illegal concurrency. In particular, QueryIterator{Ex} methods allow for the result of the internal query to be consumed in "streaming" fashion but we must do so without any concurrency, and it's achieved by using "sync" result channel (which synchronizes the reader ("outer" query) and the writer (InternalExecutor)). However, previously the internal query could result in illegal concurrency on its own - if it happens to use DistSQL. During 23.1 time frame we started populating the SessionData with proper session defaults in some cases and completed this work in 23.2; as a result, the internally-executed queries can now use DistSQL, but we must disable it in this "sync" mode, when the root txn is specified, which is what this commit does.

We already made a similar change to disable the Streamer some time ago for the same reason in ed3f640.

I spent quite a few hours to come up with a reproduction but didn't succeed, so there is no regression test in this commit.

Fixes: #118542.

Release note (bug fix): Previously, CockroachDB could encounter an internal error "attempting to append refresh spans after the tracked timestamp has moved forward" in some cases when using virtual tables (like crdb_internal.system_jobs, etc), and this has now been fixed. The bug was introduced in 23.1 version.

Release justification: bug fix.

Previously, it was possible for some methods of the internal executor
result in illegal concurrency. In particular, `QueryIterator{Ex}`
methods allow for the result of the internal query to be consumed in
"streaming" fashion but we must do so without any concurrency, and
it's achieved by using "sync" result channel (which synchronizes the
reader ("outer" query) and the writer (InternalExecutor)). However,
previously the internal query could result in illegal concurrency on its
own - if it happens to use DistSQL. During 23.1 time frame we started
populating the SessionData with proper session defaults in some cases
and completed this work in 23.2; as a result, the internally-executed
queries can now use DistSQL, but we must disable it in this "sync" mode,
when the root txn is specified, which is what this commit does.

We already made a similar change to disable the Streamer some time ago
for the same reason in ed3f640.

I spent quite a few hours to come up with a reproduction but didn't
succeed, so there is no regression test in this commit.

Release note (bug fix): Previously, CockroachDB could encounter an
internal error "attempting to append refresh spans after the tracked
timestamp has moved forward" in some cases when using virtual tables
(like `crdb_internal.system_jobs`, etc), and this has now been fixed.
The bug was introduced in 23.1 version.
Copy link

blathers-crl bot commented Feb 14, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Feb 14, 2024
Copy link

blathers-crl bot commented Feb 14, 2024

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich yuzefovich merged commit 4b95e02 into cockroachdb:release-23.2 Feb 15, 2024
5 of 6 checks passed
@yuzefovich yuzefovich deleted the backport23.2-119176 branch February 15, 2024 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants