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

Revert "sql: Add database ID to sampled query log" #85017

Merged
merged 1 commit into from
Jul 29, 2022

Conversation

THardy98
Copy link

Reverts: #84195
This reverts commit 307817e.

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 THardy98 requested a review from a team July 25, 2022 18:14
@cockroach-teamcity
Copy link
Member

This change is Reviewable

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

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.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @maryliag and @THardy98)


pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):

  // Statement fingerprint ID of the query.
  uint64 statement_fingerprint_id = 12 [(gogoproto.customname) = "StatementFingerprintID", (gogoproto.jsontag) = ',omitempty'];

change back fingerprint to 13 and add 12 as reserved

@THardy98 THardy98 force-pushed the revert_database_id branch from 61eaa5f to a4ec92a Compare July 27, 2022 14:45
Copy link
Author

@THardy98 THardy98 left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @maryliag)


pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):

Previously, maryliag (Marylia Gutierrez) wrote…

change back fingerprint to 13 and add 12 as reserved

Reserved 12 and reverted back to 13.
Small gen.go change to accomodate reserved fields in the proto.

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.

Reviewed 3 of 5 files at r1, 1 of 1 files at r2, 1 of 2 files at r3, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @maryliag and @THardy98)


pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):

Previously, THardy98 (Thomas Hardy) wrote…

Reserved 12 and reverted back to 13.
Small gen.go change to accomodate reserved fields in the proto.

Move the reserved list to the end

@THardy98 THardy98 force-pushed the revert_database_id branch from a4ec92a to 7c08bab Compare July 27, 2022 20:06
@THardy98
Copy link
Author

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 29, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jul 29, 2022

Merge conflict.

@THardy98
Copy link
Author

bors r-

Reverts: cockroachdb#84195
This reverts commit 307817e.

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 THardy98 force-pushed the revert_database_id branch from 7c08bab to 53d2cd6 Compare July 29, 2022 14:09
@THardy98
Copy link
Author

bors r+

@craig craig bot merged commit 7e2df69 into cockroachdb:master Jul 29, 2022
@craig
Copy link
Contributor

craig bot commented Jul 29, 2022

Build succeeded:

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