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.1: sql: fix StatementStatistics.Nodes list #106776

Merged
merged 1 commit into from
Jul 14, 2023
Merged

release-23.1: sql: fix StatementStatistics.Nodes list #106776

merged 1 commit into from
Jul 14, 2023

Conversation

j82w
Copy link
Contributor

@j82w j82w commented Jul 13, 2023

Backport 1/1 commits from #106587.

/cc @cockroachdb/release


  1. Fixes the nodes list to show all the nodes in StatementStatistics.Nodes.
  2. The node list is now empty if tracing is disabled. Previously it would always include the current gateway node id, but it would be missing all the other nodes. This causes confusion because it's uncertain whether the node list is complete or not.
  3. Fixes regions on EXPLAIN ANALYSE (DISTSQL) to show regions information on secondary tenenants. It was not shown before because only system tenants have access to gossip which is used under the covers to get the node descriptors.
  4. Fixes the performance issues previously listed in sqlstats: "get regions for node" logic is extremely inefficient #102170.
  5. Fixes the test to actually validate the nodes list.

The fix was done by adding the region name to the Flow ComponentID. This means the region name is now part of the traces for the Flow ComponentID, so it no longer needs figure out the region. It gets the region information from the same trace the SQL Instance ID is obtained. Moving the collection to the QueryLevelStats avoids iterating the traces multiple times.

Fixes: #102170, fixes: #96647, fixes: #91219;
Epic: none
Release note (bug fix): Fixes the StatementStatistics.Nodes to
contain all the nodes involved in the query. Adds region info to
EXPLAIN ANALYSE (DISTSQL) for secondary tenants.

Release Justification: Bug fix the node and region information.

1. Fixes the nodes list to show all the nodes in
    StatementStatistics.Nodes.
2. The node list is now empty if tracing is disabled. Previously it
    would always include the current gateway node id, but it would be
    missing all the other nodes. This causes confusion because it's
    uncertain whether the node list is complete or not.
3. Fixes regions on `EXPLAIN ANALYSE (DISTSQL)` to show regions
    information on secondary tenenants. It was not shown before because
    only system tenants have acces to gossip which is used under the
    covers to get the node descriptors.
4. Fixes the performance issues previously listed in #102170.
5. Fixes the test to actually validate the nodes list.

The fix was done by adding the region name to the Flow ComponentID. This
means the region name is now part of the traces for the Flow
ComponentID, so it no longer needs figure out the region. It gets the
region information from the same trace the SQL Instance ID is obtained.
Moving the collection to the QueryLevelStats avoids iterating the traces
multiple times.

Fixes: #102170, #96647, #91219
Epic: none
Release note (bug fix): Fixed the StatementStatistics.Nodes to
contain all the nodes involved in the query. Fixed region info in
`EXPLAIN ANALYSE (DISTSQL)` for seconary tenants.
@j82w j82w requested a review from a team July 13, 2023 18:46
@j82w j82w requested a review from a team as a code owner July 13, 2023 18:46
@j82w j82w requested a review from rytaft July 13, 2023 18:46
@blathers-crl
Copy link

blathers-crl bot commented Jul 13, 2023

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?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

Reviewed 18 of 18 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @rytaft)

@j82w j82w merged commit 3fc2c00 into cockroachdb:release-23.1 Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants