Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

*: fix redact log (#8415) #8571

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #8415

What problem does this PR solve?

Issue Number: Close #8419.

What is changed and how does it work?

Check List

Tests

  • Manual test

previous with redact log enabled:

[2024/07/18 11:32:59.548 +08:00] [INFO] [keyspace.go:383] ["[keyspace] added region label for keyspace"] [keyspace-id=0] [label-rule="{\"id\":\"keyspaces/0\",\"index\":0,\"labels\":[{\"key\":\"id\",\"value\":\"0\"}],\"rule_type\":\"key-range\",\"data\":[{\"start_key\":\"7200000000000000fb\",\"end_key\":\"7200000100000000fb\"},{\"start_key\":\"7800000000000000fb\",\"end_key\":\"7800000100000000fb\"}]}"] [takes=1.505851ms]
[2024/07/18 11:32:59.787 +08:00] [INFO] [cluster_worker.go:248] ["region batch split, generate new regions"] [region-id=12] [origin="id:14 end_key:\"748000FFFFFFFFFFFFF900000000000000F8\" region_epoch:<conf_ver:1 version:7 > peers:<id:15 store_id:1 >"] [total=1]

now with redact log disabled:

[2024/07/18 11:24:55.806 +08:00] [INFO] [keyspace.go:384] ["[keyspace] added region label for keyspace"] [keyspace-id=0] [label-rule="id: keyspaces/0, index: 0, type: key-range, labels: [key: id, value: 0], data: [startKey: {7200000000000000fb}, endKey: {7200000100000000fb}, startKey: {7800000000000000fb}, endKey: {7800000100000000fb}]"] [takes=1.031017ms]
[2024/07/18 11:24:56.768 +08:00] [INFO] [cluster_worker.go:248] ["region batch split, generate new regions"] [region-id=10] [origin="id:12 end_key:\"748000FFFFFFFFFFFFFA00000000000000F8\" region_epoch:<conf_ver:1 version:6 > peers:<id:13 store_id:1 >"] [total=1]

now with redact log enabled:

[2024/07/18 11:26:17.840 +08:00] [INFO] [keyspace.go:384] ["[keyspace] added region label for keyspace"] [keyspace-id=0] [label-rule=?] [takes=1.007138ms]
[2024/07/18 11:26:20.371 +08:00] [INFO] [cluster_worker.go:248] ["region batch split, generate new regions"] [region-id=14] [origin=?] [total=1]

Release note

None.

close tikv#8419

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 27, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 27, 2024
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Aug 27, 2024
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved labels Aug 27, 2024
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 27, 2024
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 27, 2024
Copy link
Contributor

ti-chi-bot bot commented Aug 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HuSharp, lhy1024

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 28, 2024
Copy link
Contributor

ti-chi-bot bot commented Aug 28, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-08-27 09:56:27.326195256 +0000 UTC m=+864182.460645377: ☑️ agreed by HuSharp.
  • 2024-08-28 07:45:19.890618575 +0000 UTC m=+942715.025068709: ☑️ agreed by lhy1024.

Copy link
Contributor

ti-chi-bot bot commented Aug 28, 2024

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot bot merged commit 7904d55 into tikv:release-7.1 Aug 28, 2024
18 checks passed
@HuSharp HuSharp deleted the cherry-pick-8415-to-release-7.1 branch September 3, 2024 05:21
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants