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

Revert "Fix tiflash not start with newest nightly PD (#902)" #1280

Merged
merged 6 commits into from
Apr 7, 2021

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented Apr 5, 2021

This reverts commit 402079d.

We should reverts #902 because it introduced an issue:
#1279

BTW, PD itself fixes #888 in tikv/pd#3163
So we don't need #902 anymore with recently released PD.

However, after revert #902, TiFlash with old PD (before #3163) may not work with tiup-playground

What problem does this PR solve?

What is changed and how it works?

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

This reverts commit 402079d.

We should reverts pingcap#902 because it introduced an issue:
pingcap#1279

BTW, PD itself fixes pingcap#888 in tikv/pd#3163
So we don't need pingcap#902 anymore with recently released PD.

However, after revert pingcap#902, *** old PDs (before #3163) may not work
with tiup-playground ***
@ti-chi-bot ti-chi-bot requested review from lonng and nrc April 5, 2021 14:05
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 5, 2021
@lucklove lucklove added this to the v1.4.1 milestone Apr 5, 2021
@codecov-io
Copy link

codecov-io commented Apr 5, 2021

Codecov Report

Merging #1280 (99be167) into master (c9b58c9) will increase coverage by 9.91%.
The diff coverage is 77.22%.

❗ Current head 99be167 differs from pull request most recent head 0cc9d28. Consider uploading reports for the commit 0cc9d28 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1280      +/-   ##
==========================================
+ Coverage   26.28%   36.20%   +9.91%     
==========================================
  Files         263      224      -39     
  Lines       18840    16388    -2452     
==========================================
+ Hits         4953     5933     +980     
+ Misses      13115     9409    -3706     
- Partials      772     1046     +274     
Flag Coverage Δ
cluster 36.20% <77.22%> (?)
integrate 36.20% <77.22%> (+19.66%) ⬆️
tiup ?
unittest ?

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

Impacted Files Coverage Δ
components/cluster/command/reload.go 60.00% <0.00%> (+20.00%) ⬆️
pkg/checkpoint/checkpoint.go 72.15% <0.00%> (+20.25%) ⬆️
pkg/cluster/manager/builder.go 34.41% <0.00%> (+34.41%) ⬆️
pkg/cluster/operation/operation.go 69.56% <ø> (ø)
pkg/cluster/manager/rename.go 20.00% <20.00%> (+20.00%) ⬆️
pkg/cluster/manager/basic.go 62.35% <42.85%> (+62.35%) ⬆️
pkg/cluster/spec/pd.go 31.73% <60.00%> (+16.76%) ⬆️
pkg/cluster/spec/tikv.go 26.76% <60.00%> (+10.60%) ⬆️
pkg/cluster/api/pdapi.go 20.82% <66.66%> (+20.82%) ⬆️
pkg/cluster/manager/patch.go 50.51% <75.00%> (+50.51%) ⬆️
... and 248 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 c9b58c9...0cc9d28. Read the comment docs.

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 5, 2021
@lucklove lucklove force-pushed the revoke-902 branch 3 times, most recently from f619bc3 to a580703 Compare April 5, 2021 16:14
@AstroProfundis
Copy link
Contributor

tikv/pd#3163 only appears on v5.0.0-rc, v5.0.0-nightly and master of PD, so none of v4.x versions have that fix applied. I think we need to add version check instead of revert it back.

@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 6, 2021
@lucklove
Copy link
Member Author

lucklove commented Apr 6, 2021

I have test tiup playground v4.0.{9, 10, 11, 12}, all works fine.

@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c03398e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TiUP doesn't download tiflash component in playground subcommand and reports 'queer' error message.
4 participants