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

cluster: skip dir conflict if node marked ignore_exporter #1649

Merged
merged 1 commit into from
Dec 3, 2021

Conversation

AstroProfundis
Copy link
Contributor

What problem does this PR solve?

If both clusters have the same monitor deploy dir set in their topology files, scaling out one with ignore_exporter: true to a shared host still reporting an directory conflict error.

What is changed and how it works?

Ignore dir conflict error if both sides are monitor directories and one of them is marked as ignore_exporter.

This is a following up of #1492

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release notes:

NONE

@AstroProfundis AstroProfundis added this to the v1.8.0 milestone Dec 2, 2021
@AstroProfundis AstroProfundis self-assigned this Dec 2, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 2, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nexustar

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 2, 2021
@codecov-commenter
Copy link

codecov-commenter commented Dec 2, 2021

Codecov Report

Merging #1649 (1840f0f) into master (5e97222) will increase coverage by 34.81%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1649       +/-   ##
===========================================
+ Coverage   15.58%   50.39%   +34.81%     
===========================================
  Files         151      294      +143     
  Lines       15250    26985    +11735     
===========================================
+ Hits         2376    13598    +11222     
+ Misses      12357    11316     -1041     
- Partials      517     2071     +1554     
Flag Coverage Δ
cluster 43.79% <0.00%> (?)
dm 25.91% <0.00%> (?)
integrate 50.39% <0.00%> (+34.81%) ⬆️
playground 13.33% <0.00%> (?)
tiup 15.57% <0.00%> (-0.01%) ⬇️
unittest ∅ <ø> (∅)

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

Impacted Files Coverage Δ
pkg/cluster/spec/validate.go 62.79% <0.00%> (+62.79%) ⬆️
components/dm/command/exec.go 87.50% <0.00%> (ø)
pkg/cluster/task/builder.go 98.73% <0.00%> (ø)
pkg/cluster/operation/scale_in.go 57.67% <0.00%> (ø)
pkg/cluster/task/env_init.go 58.97% <0.00%> (ø)
pkg/cluster/manager/upgrade.go 56.11% <0.00%> (ø)
components/playground/instance/process.go 84.90% <0.00%> (ø)
components/cluster/command/check.go 86.66% <0.00%> (ø)
pkg/cluster/ansible/inventory.go 0.00% <0.00%> (ø)
components/dm/command/reload.go 76.92% <0.00%> (ø)
... 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 5e97222...1840f0f. Read the comment docs.

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1840f0f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 3, 2021
@ti-chi-bot ti-chi-bot merged commit e7f9871 into pingcap:master Dec 3, 2021
@AstroProfundis AstroProfundis deleted the fix-ignore-exporter branch December 3, 2021 11:42
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.

4 participants