release-21.2: revert "sql: add database ID to sampled query log" #85022
Conversation
|
This change is |
There was a problem hiding this comment.
update your PR title to add release-21.2:... and use only lower case, unless is the name of a variable
Reviewable status:
complete! 1 of 0 LGTMs obtained
THardy98
force-pushed
the
revert_database_id_21.2
branch
from
b174ee2 to
0432dae
Compare
THardy98
changed the title
Updated. |
THardy98
added
blathers-backport
There was a problem hiding this comment.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 60 at r2 (raw file):
// Statement fingerprint ID of the query. uint64 statement_fingerprint_id = 12 [(gogoproto.customname) = "StatementFingerprintID", (gogoproto.jsontag) = ',omitempty'];
to keep aligned with 22.1 and mater, go back to fingerprint 13 and add 12 as reserved
Reverts: cockroachdb#84195 This reverts commit c633d13. 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
force-pushed
the
revert_database_id_21.2
branch
from
0432dae to
1d4d147
Compare
There was a problem hiding this comment.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 60 at r2 (raw file):
Previously, maryliag (Marylia Gutierrez) wrote…
to keep aligned with 22.1 and mater, go back to fingerprint 13 and add 12 as reserved
Reserved 12 and reverted back to 13.
Small gen.go change to accomodate reserved fields in the proto.
There was a problem hiding this comment.
small nit, otherwise
Reviewed 3 of 6 files at r1, 1 of 1 files at r2, 2 of 3 files at r3, all commit messages.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 59 at r3 (raw file):
string transaction_id = 11 [(gogoproto.customname) = "TransactionID", (gogoproto.jsontag) = ',omitempty', (gogoproto.moretags) = "redact:\"nonsensitive\""]; reserved 12;
we usually put the list of reserved at the end, so people can just add items there
Reverts: #84195
This reverts commit c633d13.
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.
Release justification: Category 2: Bug fixes and low-risk updates to new functionality