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

Fix the compatibility with PD v3.x #1274

Merged
merged 2 commits into from
Apr 2, 2021
Merged

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented Apr 1, 2021

What problem does this PR solve?

In #1161, we introduce a mechanism which temporarily increase schedule limit during upgrading/reloading tikv, to speed up the upgrade process. But the v3.x of PD doesn't support config schedule limit at all:
屏幕快照 2021-04-01 下午5 35 38

What is changed and how it works?

Check the current version of PD, only apply the mechanism on v4.x or latter.

Check List

Tests

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

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

NONE

@lucklove lucklove added this to the v1.4.1 milestone Apr 1, 2021
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 1, 2021
@codecov-io
Copy link

codecov-io commented Apr 1, 2021

Codecov Report

Merging #1274 (48b3a37) into master (cf55cab) will increase coverage by 0.27%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1274      +/-   ##
==========================================
+ Coverage   26.23%   26.50%   +0.27%     
==========================================
  Files         263      275      +12     
  Lines       18884    19322     +438     
==========================================
+ Hits         4954     5122     +168     
- Misses      13158    13412     +254     
- Partials      772      788      +16     
Flag Coverage Δ
integrate 16.04% <0.00%> (-0.50%) ⬇️
playground 3.10% <0.00%> (?)
tiup 16.52% <0.00%> (-0.03%) ⬇️
unittest 22.73% <0.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/cluster/api/pdapi.go 0.00% <0.00%> (ø)
components/playground/instance/tiflash.go 0.00% <0.00%> (ø)
components/playground/instance/process.go 0.00% <0.00%> (ø)
...onents/playground/instance/tiflash_proxy_config.go 0.00% <0.00%> (ø)
components/playground/instance/instance.go 0.00% <0.00%> (ø)
components/playground/instance/ticdc.go 0.00% <0.00%> (ø)
components/playground/instance/tiflash_config.go 0.00% <0.00%> (ø)
components/playground/instance/tidb.go 0.00% <0.00%> (ø)
components/playground/instance/drainer.go 0.00% <0.00%> (ø)
components/playground/instance/pump.go 0.00% <0.00%> (ø)
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cf55cab...48b3a37. Read the comment docs.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AstroProfundis

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 2, 2021
@AstroProfundis AstroProfundis added the type/bug-fix Categorizes PR as a bug-fix label Apr 2, 2021
@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ffb209c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 2, 2021
@ti-chi-bot ti-chi-bot merged commit 9049356 into pingcap:master Apr 2, 2021
@lucklove lucklove deleted the fix-compat branch April 2, 2021 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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/LGT1 Indicates that a PR has LGTM 1. type/bug-fix Categorizes PR as a bug-fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants