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 TiKV config check false alarm when data_dir is depended on #1471

Merged
merged 7 commits into from
Jul 6, 2021

Conversation

tabokie
Copy link
Contributor

@tabokie tabokie commented Jul 5, 2021

What problem does this PR solve?

When TiKV config check requires correct data_dir value, tiup config check will fail because it doesn't feed that information to TiKV.

What is changed and how it works?

Add extra data path parameter when doing TiKV config check.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release notes:

NONE

@CLAassistant
Copy link

CLAassistant commented Jul 5, 2021

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 5, 2021
@codecov-commenter
Copy link

codecov-commenter commented Jul 5, 2021

Codecov Report

Merging #1471 (57eb263) into master (8186387) will increase coverage by 22.99%.
The diff coverage is 100.00%.

❗ Current head 57eb263 differs from pull request most recent head f713108. Consider uploading reports for the commit f713108 to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1471       +/-   ##
===========================================
+ Coverage   24.85%   47.84%   +22.99%     
===========================================
  Files         267      292       +25     
  Lines       21267    23161     +1894     
===========================================
+ Hits         5285    11082     +5797     
+ Misses      15175    10333     -4842     
- Partials      807     1746      +939     
Flag Coverage Δ
cluster 33.42% <100.00%> (?)
dm 23.23% <0.00%> (?)
integrate 42.15% <100.00%> (+26.91%) ⬆️
playground 13.41% <0.00%> (?)
tiup 15.24% <0.00%> (ø)
unittest 21.49% <0.00%> (ø)

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

Impacted Files Coverage Δ
pkg/cluster/spec/server_config.go 69.23% <100.00%> (+14.74%) ⬆️
pkg/cluster/operation/check.go 0.00% <0.00%> (ø)
pkg/logger/audit.go 53.33% <0.00%> (ø)
pkg/cluster/operation/action.go 62.02% <0.00%> (ø)
pkg/cluster/operation/scale_in.go 57.05% <0.00%> (ø)
pkg/logger/logger.go 100.00% <0.00%> (ø)
components/playground/instance/instance.go 45.45% <0.00%> (ø)
components/playground/instance/ticdc.go 0.00% <0.00%> (ø)
components/playground/instance/pd.go 73.91% <0.00%> (ø)
pkg/cluster/operation/operation.go 69.56% <0.00%> (ø)
... and 181 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 8186387...f713108. Read the comment docs.

@AstroProfundis
Copy link
Contributor

Is this argument working for all versions of TiKV on config check?

@tabokie
Copy link
Contributor Author

tabokie commented Jul 6, 2021

Is this argument working for all versions of TiKV on config check?

I think so, we are using it here as well:

fmt.Sprintf("--data-dir=%s", filepath.Join(inst.Dir, "data")),

@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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 6, 2021
@tabokie
Copy link
Contributor Author

tabokie commented Jul 6, 2021

Are the test failures related? I don't understand them😢

@AstroProfundis
Copy link
Contributor

AstroProfundis commented Jul 6, 2021

Are the test failures related? I don't understand themcry

Umm no, just retry and watch...

@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f713108

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 6, 2021
@AstroProfundis AstroProfundis added this to the v1.5.3 milestone Jul 6, 2021
@ti-chi-bot ti-chi-bot merged commit 67f756d into pingcap:master Jul 6, 2021
@tabokie tabokie deleted the patch-1 branch July 6, 2021 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 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.

6 participants