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: cli: create new tracing span in mt-start-sql #113595

Merged
merged 1 commit into from
Nov 1, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 1, 2023

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

/cc @cockroachdb/release


This commit fixes a possible misuse of the tracing infrastructure with mt start-sql command. In particular, previously it was possible for a tracing span created (and finished) in runStartInternal to be used by a couple of things in makeTenantSQLServerArgs (main one being rpc.Context) that hold on to the context after the corresponding span has been finished. This is disallowed (since we reuse spans after Finish has been called on them) and was recently discovered. This problem is now fixed by deriving a child span only in mt start-sql code path that is never finished (since those users can be active throughout the whole lifetime of the tenant server).

The bug is pretty minor (I think only serverless is affected), so there is no release note.

Fixes: #113170.

Release note: None


Release justification: low-risk bug fix.

This commit fixes a possible misuse of the tracing infrastructure with
`mt start-sql` command. In particular, previously it was possible for
a tracing span created (and finished) in `runStartInternal` to be used
by a couple of things in `makeTenantSQLServerArgs` (main one being
`rpc.Context`) that hold on to the context after the corresponding span
has been finished. This is disallowed (since we reuse spans after
`Finish` has been called on them) and was recently discovered. This
problem is now fixed by deriving a child span only in `mt start-sql`
code path that is never finished (since those users can be active
throughout the whole lifetime of the tenant server).

The bug is pretty minor (I think only serverless is affected), so there
is no release note.

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners November 1, 2023 16:49
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-113553 branch 2 times, most recently from e28fcdd to d9f3d98 Compare November 1, 2023 16:49
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 1, 2023
Copy link
Author

blathers-crl bot commented Nov 1, 2023

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 Nov 1, 2023
Copy link
Author

blathers-crl bot commented Nov 1, 2023

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

Copy link
Collaborator

@jeffswenson jeffswenson left a comment

Choose a reason for hiding this comment

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

LGTM

The fix is low risk and only impacts Serverless deployments.

@yuzefovich yuzefovich merged commit 9f2d988 into release-23.2 Nov 1, 2023
2 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-23.2-113553 branch November 1, 2023 20:29
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 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