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

cluster: reuse cluster.DeployOption and spec.PDScaleScript #1253

Merged
merged 8 commits into from
Mar 31, 2021
Merged

cluster: reuse cluster.DeployOption and spec.PDScaleScript #1253

merged 8 commits into from
Mar 31, 2021

Conversation

9547
Copy link
Contributor

@9547 9547 commented Mar 27, 2021

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

@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 27, 2021
lucklove
lucklove reviewed Mar 29, 2021
View reviewed changes
pkg/cluster/template/scripts/pd.go
return err
}
return os.WriteFile(file, config, 0755)
return c.configWithScript("run_pd_scale.sh.tpl")
Copy link
Member

Choose a reason for hiding this comment

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

I think this may not work as you expected since you removed func (c *PDScaleScript) WithXXX.

When we call WithXXX in scale out stage, the WithXXX will return a PDScript pointer because you removed WithXXX on PDScaleScript (it will fallback to PDScript's WithXXX). Then when you call ConfigToFile or Config, it will call on PDScript, so the script generated in scale-out stage is not correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your professional advice 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

PTAL

Copy link
Member

Choose a reason for hiding this comment

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

Still not work because PDScaleScript not implements ConfigToFile

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, please take another look.

@9547 9547 force-pushed the feature/dry-cluster branch from 7520239 to bdf2bb5 Compare March 29, 2021 17:32
@codecov-io
Copy link

codecov-io commented Mar 29, 2021 •
edited
Loading

Codecov Report

Merging #1253 (450b25d) into master (b56c8ad) will decrease coverage by 23.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #1253       +/-   ##
==========================================
- Coverage   26.17%   3.09%   -23.08%     
==========================================
  Files         263      79      -184     
  Lines       18841    6944    -11897     
==========================================
- Hits         4931     215     -4716     
+ Misses      13144    6703     -6441     
+ Partials      766      26      -740
Flag Coverage Δ
integrate 3.09% <ø> (-13.44%) ⬇️
playground 3.09% <ø> (?)
tiup ?
unittest ?

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

Impacted Files Coverage Δ
pkg/utils/semver.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/environment/tiup.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/repository/progress.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/telemetry/scrub.go 0.00% <0.00%> (-86.67%) ⬇️
pkg/utils/diff.go 0.00% <0.00%> (-82.50%) ⬇️
pkg/repository/v1manifest/types.go 0.00% <0.00%> (-82.06%) ⬇️
pkg/repository/utils/hash.go 0.00% <0.00%> (-81.82%) ⬇️
pkg/telemetry/meta.go 0.00% <0.00%> (-80.00%) ⬇️
pkg/repository/store/local.go 0.00% <0.00%> (-76.48%) ⬇️
... and 237 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 b56c8ad...450b25d. Read the comment docs.

@9547 9547 force-pushed the feature/dry-cluster branch from bdf2bb5 to 450b25d Compare March 30, 2021 15:39
@lucklove
Copy link
Member

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lucklove

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 Mar 31, 2021
@lucklove
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 450b25d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 31, 2021
@AstroProfundis
Copy link
Contributor

/hold

The github actions seems to be very slow now, we'll hold all PRs until the v1.4.0 is successfully released.

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 31, 2021
@AstroProfundis
Copy link
Contributor

/hold cancel

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 31, 2021
@AstroProfundis
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit c9b58c9 into pingcap:master Mar 31, 2021
@lucklove lucklove added this to the v1.4.1 milestone Apr 1, 2021
@9547 9547 deleted the feature/dry-cluster branch April 6, 2021 23:00
AstroProfundis pushed a commit that referenced this pull request Apr 7, 2021
@jsvisa @AstroProfundis
cluster: reuse cluster.DeployOption and spec.PDScaleScript (#1253)
11827c7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucklove lucklove lucklove left review comments

@AstroProfundis AstroProfundis Awaiting requested review from AstroProfundis

@breezewish breezewish Awaiting requested review from breezewish

Assignees
No one assigned
Labels
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/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
v1.4.1
Development

Successfully merging this pull request may close these issues.
6 participants
@9547 @codecov-io @lucklove @ti-chi-bot @AstroProfundis @jsvisa