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

fix: the results of tikv and tiflash are different (#5839) #5874

Merged
merged 11 commits into from
Sep 14, 2022
Merged

fix: the results of tikv and tiflash are different (#5839) #5874

merged 11 commits into from
Sep 14, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5839

What problem does this PR solve?

Issue Number: close #5849, close pingcap/tidb#37258

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot ti-chi-bot mentioned this pull request Sep 14, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added 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-5.4 This PR is cherry-picked to release-5.4 from a source PR. labels Sep 14, 2022
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • windtalker

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

windtalker
windtalker approved these changes Sep 14, 2022
View reviewed changes
Copy link
Contributor

@windtalker windtalker left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 14, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 14, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 14, 2022
@JaySon-Huang JaySon-Huang added this to the v5.4.3 milestone Sep 14, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 14, 2022
@xzhangxian1008
Copy link
Contributor

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Sep 14, 2022

lines: 30.2% (3259 out of 10801)
branches: 13.6% (2332 out of 17143)

@windtalker
Copy link
Contributor

/run-all-tests

@windtalker
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@windtalker: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: b325c72

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 14, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Sep 14, 2022

lines: 30.2% (3259 out of 10801)
branches: 13.6% (2333 out of 17143)

@ti-chi-bot ti-chi-bot merged commit 70bbf76 into pingcap:release-5.4 Sep 14, 2022
@xzhangxian1008 xzhangxian1008 deleted the cherry-pick-5839-to-release-5.4 branch September 14, 2022 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@windtalker windtalker windtalker approved these changes

@SeaRise SeaRise SeaRise approved these changes

Assignees

@xzhangxian1008 xzhangxian1008

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Milestone
v5.4.3
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-chi-bot @xzhangxian1008 @sre-bot @windtalker @SeaRise @JaySon-Huang @VelocityLight