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

br: use merge-schedule-limit to pause merge (#47576) #48247

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #47576

What problem does this PR solve?

Issue Number: ref tikv/pd#7148

Problem Summary:
max-merge-region-keys is not a stable arguments.
merge-schedule-limit is more stable to control the merge operator.

What is changed and how it works?

use merge-schedule-limit instead of other arguments to control the merge operator during restore.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-issue-check Indicates that a PR no need to check linked issue. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Nov 2, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 2, 2023
Copy link

codecov bot commented Nov 2, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@b7f909c). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #48247   +/-   ##
================================================
  Coverage               ?   74.0461%           
================================================
  Files                  ?       1086           
  Lines                  ?     352661           
  Branches               ?          0           
================================================
  Hits                   ?     261132           
  Misses                 ?      75202           
  Partials               ?      16327           

Copy link

ti-chi-bot bot commented Nov 20, 2023

@CabinfeverB: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Nov 22, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Nov 22, 2023
Copy link

ti-chi-bot bot commented Nov 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3pointer, CabinfeverB, nolouch

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 22, 2023
Copy link

ti-chi-bot bot commented Nov 22, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-22 07:54:22.918905316 +0000 UTC m=+390891.584131504: ☑️ agreed by 3pointer.
  • 2023-11-22 08:00:23.979095383 +0000 UTC m=+391252.644321579: ☑️ agreed by nolouch.

@CabinfeverB
Copy link
Contributor

/retest-required

@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit 17f58e8 into pingcap:release-6.5 Nov 22, 2023
18 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-issue-check Indicates that a PR no need to check linked issue. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants