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 the issue that the imported monitor directory may conflict with o… #1386

Merged
merged 1 commit into from
May 26, 2021

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented May 25, 2021

Fix #1385

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

@lucklove lucklove added this to the v1.4.4 milestone May 25, 2021
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 25, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #1386 (e563e15) into master (876377b) will increase coverage by 28.85%.
The diff coverage is 33.33%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1386       +/-   ##
===========================================
+ Coverage   25.26%   54.11%   +28.85%     
===========================================
  Files         266      291       +25     
  Lines       20583    22469     +1886     
===========================================
+ Hits         5200    12160     +6960     
+ Misses      14583     8375     -6208     
- Partials      800     1934     +1134     
Flag Coverage Δ
cluster 41.82% <0.00%> (?)
dm 24.53% <0.00%> (?)
integrate 48.67% <0.00%> (+33.16%) ⬆️
playground 13.74% <0.00%> (?)
tiup 15.50% <0.00%> (-0.01%) ⬇️
unittest 21.58% <33.33%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
pkg/cluster/spec/validate.go 92.32% <33.33%> (+2.02%) ⬆️
pkg/cluster/operation/operation.go 78.26% <0.00%> (ø)
components/playground/instance/tiflash_config.go 100.00% <0.00%> (ø)
components/playground/instance/tiflash.go 59.09% <0.00%> (ø)
components/dm/task/update_dm_meta.go 85.29% <0.00%> (ø)
components/playground/instance/drainer.go 0.00% <0.00%> (ø)
pkg/cluster/operation/upgrade.go 57.27% <0.00%> (ø)
components/playground/instance/process.go 81.39% <0.00%> (ø)
pkg/cluster/operation/telemetry.go 0.00% <0.00%> (ø)
pkg/cluster/operation/scale_in.go 58.27% <0.00%> (ø)
... and 211 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 876377b...e563e15. Read the comment docs.

@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 May 26, 2021
@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e563e15

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 26, 2021
@ti-chi-bot ti-chi-bot merged commit c04ed16 into pingcap:master May 26, 2021
@lucklove lucklove deleted the fix-monitor-dir-check branch August 4, 2021 13:52
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 cluster scale-out "Error: Deploy directory overlaps to another instance (spec.deploy.dir_overlap) "
4 participants