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(cluster/display): don't print dashboardAddr if none or auto #1054

Merged
merged 1 commit into from
Jan 12, 2021

Conversation

9547
Copy link
Contributor

@9547 9547 commented Jan 10, 2021

What problem does this PR solve?

the dashboardAddr maybe none or auto, don't print it.
ref

if dashboardAddr == "auto" {
return fmt.Errorf("TiDB Dashboard is not initialized, please start PD and try again")
} else if dashboardAddr == "none" {
return fmt.Errorf("TiDB Dashboard is disabled")
}
,

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

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

codecov-io commented Jan 10, 2021

Codecov Report

Merging #1054 (9fd5a22) into master (df76e55) will increase coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1054      +/-   ##
==========================================
+ Coverage   55.88%   55.92%   +0.04%     
==========================================
  Files         282      282              
  Lines       19868    19868              
==========================================
+ Hits        11103    11112       +9     
+ Misses       7037     7031       -6     
+ Partials     1728     1725       -3     
Flag Coverage Δ
cluster 43.95% <100.00%> (ø)
dm 24.04% <0.00%> (+0.10%) ⬆️
integrate 50.23% <100.00%> (+0.04%) ⬆️
playground 20.31% <ø> (ø)
tiup 16.48% <ø> (ø)
unittest 22.28% <0.00%> (ø)

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

Impacted Files Coverage Δ
pkg/cluster/manager/display.go 84.25% <100.00%> (+1.57%) ⬆️
components/dm/spec/topology_dm.go 83.02% <0.00%> (+0.61%) ⬆️
pkg/cluster/api/dmapi.go 62.60% <0.00%> (+4.34%) ⬆️

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 df76e55...9fd5a22. Read the comment docs.

@lucklove
Copy link
Member

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 12, 2021
@lucklove
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9fd5a22

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 12, 2021
@ti-chi-bot ti-chi-bot merged commit d96ff5c into pingcap:master Jan 12, 2021
@9547 9547 deleted the fix/donot-print-dashboard-if-none branch April 6, 2021 23:05
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.

4 participants