Apply config file on scaled pd server #627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix pingcap#626 Signed-off-by: lucklove <[email protected]>
Codecov Report
@@ 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
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
lonng
reviewed
Jul 24, 2020
pkg/cluster/spec/pd.go
Outdated
| @@ -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 { | |||
There was a problem hiding this comment.
This line is too long, please split it into two lines.
ti-srebot
added
status/LGT2
ti-srebot
approved these changes
Jul 24, 2020
Signed-off-by: lucklove <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #626
Signed-off-by: lucklove [email protected]