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

pkg/member: Fixing residual counts in campaign times (#8226) #8230

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #8226

What problem does this PR solve?

Issue Number: Close #8225

What is changed and how does it work?

  • Remove timeout times count
  • Make sure it's the current 5min judgment

Check List

Tests

  • Integration test

Release note

fixing residual counts in campaign times

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels May 30, 2024
Copy link
Contributor

ti-chi-bot bot commented May 30, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HuSharp
  • JmPotato

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.

Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp force-pushed the cherry-pick-8226-to-release-7.5 branch from a5b394a to 7749388 Compare May 30, 2024 08:51
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@HuSharp HuSharp requested a review from JmPotato May 30, 2024 08:57
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 30, 2024
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 30, 2024
@HuSharp
Copy link
Member

HuSharp commented May 30, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented May 30, 2024

@HuSharp: 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.

Copy link
Contributor

ti-chi-bot bot commented May 30, 2024

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

Commit hash: 0b63ac0

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2024
@ti-chi-bot ti-chi-bot bot merged commit 23f8a7c into tikv:release-7.5 May 30, 2024
20 checks passed
@HuSharp HuSharp deleted the cherry-pick-8226-to-release-7.5 branch May 30, 2024 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants