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.

Sign up for GitHub

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

Jump to bottom

release-22.1: sql: Add database ID to sampled query log #84354

Merged
merged 1 commit into from
Jul 21, 2022
Merged

release-22.1: sql: Add database ID to sampled query log #84354

merged 1 commit into from
Jul 21, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jul 13, 2022 •
edited by THardy98
Loading

Backport 1/1 commits from #84195 on behalf of @THardy98.

/cc @cockroachdb/release

This change adds a database ID field to the sampled query telemetry log.

Release note (sql change): Sampled query telemetry log includes new
database ID field.

Release justification: Category 4: Low risk, high benefit changes to existing functionality

sql: Add database ID to sampled query log
79dae84 
This change adds a database ID field to the sampled query telemetry log.

Release note (sql change): Sampled query telemetry log includes new
database ID field.
@blathers-crl blathers-crl bot requested a review from a team as a code owner July 13, 2022 13:27
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.1-84195 branch from 62d4d6a to 79dae84 Compare July 13, 2022 13:27
@blathers-crl blathers-crl bot requested review from maryliag and a team July 13, 2022 13:27
@blathers-crl
Copy link
Author

blathers-crl bot commented Jul 13, 2022 •
edited by THardy98
Loading

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 Jul 13, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

maryliag
maryliag approved these changes Jul 21, 2022
View reviewed changes
Copy link
Contributor

@maryliag maryliag 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 @THardy98)

@THardy98 THardy98 merged commit 0b9023d into release-22.1 Jul 21, 2022
@THardy98 THardy98 deleted the blathers/backport-release-22.1-84195 branch July 21, 2022 16:08
@cockroach-teamcity cockroach-teamcity mentioned this pull request Jul 21, 2022
Open
THardy98 pushed a commit to THardy98/cockroach that referenced this pull request Jul 25, 2022
Revert "Merge pull request cockroachdb#84354 from
504b37f 
cockroachdb/blathers/backport-release-22.1-84195"

Reverts: cockroachdb#84195, PR that introduces the DatabaseID to the `SampledQuery`
telemetry log.

This reverts commit 0b9023d, reversing
changes made to 8265e2a.

Removes the DatabaseID field from the SampledQuery telemetry log due to
the potential of indefinite blocking in the case of a lease acquisition
failure. Protobuf field not reserved as no official build was released
with these changes yet.

Release note (sql change): Removes the DatabaseID field from the
SampledQuery telemetry log due to the potential of indefinite blocking
in the case of a lease acquisition failure.
THardy98 pushed a commit to THardy98/cockroach that referenced this pull request Jul 27, 2022
Revert "Merge pull request cockroachdb#84354 from
841b4f0 
cockroachdb/blathers/backport-release-22.1-84195"

Reverts: cockroachdb#84195, PR that introduces the DatabaseID to the `SampledQuery`
telemetry log.

This reverts commit 0b9023d, reversing
changes made to 8265e2a.

Removes the DatabaseID field from the SampledQuery telemetry log due to
the potential of indefinite blocking in the case of a lease acquisition
failure. Protobuf field not reserved as no official build was released
with these changes yet.

Release note (sql change): Removes the DatabaseID field from the
SampledQuery telemetry log due to the potential of indefinite blocking
in the case of a lease acquisition failure.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maryliag maryliag maryliag approved these changes

Assignees

@THardy98 THardy98

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @maryliag @THardy98