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

Apply config file on scaled pd server #627

Merged
merged 3 commits into from
Jul 26, 2020
Merged

Conversation

lucklove
Copy link
Member

Fix #626

Signed-off-by: lucklove gnu.crazier@gmail.com

Fix pingcap#626

Signed-off-by: lucklove <gnu.crazier@gmail.com>
@lucklove lucklove requested a review from july2993 July 24, 2020 02:32
Copy link
Contributor

@july2993 july2993 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 24, 2020
@codecov-commenter
Copy link

codecov-commenter commented Jul 24, 2020

Codecov Report

Merging #627 into master will increase coverage by 0.12%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #627      +/-   ##
==========================================
+ Coverage   47.74%   47.86%   +0.12%     
==========================================
  Files         225      225              
  Lines       16749    16750       +1     
==========================================
+ Hits         7997     8018      +21     
+ Misses       7630     7608      -22     
- Partials     1122     1124       +2     
Flag Coverage Δ
#coverage 47.86% <ø> (+0.12%) ⬆️

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

Impacted Files Coverage Δ
...src/github.com/pingcap/tiup/pkg/cluster/spec/pd.go 53.07% <0.00%> (-0.42%) ⬇️
...m/pingcap/tiup/components/playground/playground.go 30.17% <0.00%> (+0.96%) ⬆️
.../pingcap/tiup/components/playground/utils/utils.go 31.91% <0.00%> (+31.91%) ⬆️

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 f00092f...f0d17b8. Read the comment docs.

@@ -217,7 +218,8 @@ func (i *PDInstance) InitConfig(e executor.Executor, clusterName, clusterVersion

// ScaleConfig deploy temporary config on scaling
func (i *PDInstance) ScaleConfig(e executor.Executor, cluster *Specification, clusterName, clusterVersion, deployUser string, paths meta.DirPaths) error {
if err := i.instance.InitConfig(e, clusterName, clusterVersion, deployUser, paths); err != nil {
// We need pd.toml here, but we don't need to check it
if err := i.InitConfig(e, clusterName, clusterVersion, deployUser, paths); err != nil && errors.Cause(err) != ErrorCheckConfig {
Copy link
Contributor

Choose a reason for hiding this comment

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

This line is too long, please split it into two lines.

Copy link
Contributor

@lonng lonng left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 24, 2020
@lucklove lucklove merged commit cb7a2c4 into pingcap:master Jul 26, 2020
@lucklove lucklove deleted the scale-pd branch July 27, 2020 02:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Config file not applyed to sclaed pd-server
5 participants