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: fix query start time for begin statements #115259

Merged
merged 1 commit into from Dec 4, 2023

Conversation

blathers-crl[bot]
Copy link

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

Backport 1/1 commits from #114831 on behalf of @xinhaoz.

/cc @cockroachdb/release


Previously, the query age for BEGIN statements appearing in logs (sql-exec, sql-audit, telemetry) was being incorrectly recorded. This is because the start time being passed was from the stats collector, which was not up to date with the session phase times at the time of executing BEGIN. This patch fixes the query age for BEGIN stmt logs by using the session phase times directly from the conn executor for BEGIN stmt logging instead reading them from the stats collector.

Epic: none
Fixes: #114571

Release note (bug fix): BEGIN statement logs now have correct query Age fields. Previously, these fields were being recorded incorrectly which would lead to some statements also appearing erroneously in the slow query logs.


Release justification: bug fix GA blocker

Previously, the query age for BEGIN statements appearing in logs
(sql-exec, sql-audit, telemetry) was being incorrectly recorded.
This is because the start time being passed was from the stats
collector, which was not up to date with the session phase times
at the time of executing BEGIN. This patch fixes the query age
for BEGIN stmt logs by using the session phase times directly
from the conn executor for BEGIN stmt logging instead reading
them from the stats collector.

Epic: none
Fixes: #114571

Release note (bug fix): BEGIN statement logs now have correct
query `Age` fields. Previously, these fields were being recorded
incorrectly which would lead to some statements also appearing
erroneously in the slow query logs.
@blathers-crl blathers-crl bot requested a review from a team as a code owner November 29, 2023 17:07
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-114831 branch from c7d1155 to 90923c8 Compare November 29, 2023 17:07
@blathers-crl blathers-crl bot requested review from abarganier and removed request for a team November 29, 2023 17:07
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-114831 branch from 2356b22 to 3dc6dc5 Compare November 29, 2023 17:07
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 29, 2023
Copy link
Author

blathers-crl bot commented Nov 29, 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 29, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@dhartunian dhartunian 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 @abarganier and @xinhaoz)

@xinhaoz xinhaoz merged commit d2bbc83 into release-23.2 Dec 4, 2023
5 of 6 checks passed
@xinhaoz xinhaoz deleted the blathers/backport-release-23.2-114831 branch December 4, 2023 18:57
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.

None yet

4 participants