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/executor: fix the issue of native ssh connect refused if port not 22 #1424

Merged
merged 2 commits into from
Jun 15, 2021

Conversation

9547
Copy link
Contributor

@9547 9547 commented Jun 12, 2021

What problem does this PR solve?

Fix the issue of missing the port in ssh connect args

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 12, 2021
@codecov-commenter
Copy link

codecov-commenter commented Jun 12, 2021

Codecov Report

Merging #1424 (e288ed1) into master (ffa74b5) will increase coverage by 28.87%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1424       +/-   ##
===========================================
+ Coverage   25.32%   54.20%   +28.87%     
===========================================
  Files         266      291       +25     
  Lines       20623    22511     +1888     
===========================================
+ Hits         5223    12201     +6978     
+ Misses      14597     8382     -6215     
- Partials      803     1928     +1125     
Flag Coverage Δ
cluster 41.94% <0.00%> (?)
dm 24.41% <28.57%> (?)
integrate 48.74% <28.57%> (+33.26%) ⬆️
playground 13.74% <0.00%> (?)
tiup 15.47% <0.00%> (-0.01%) ⬇️
unittest 21.73% <71.42%> (+0.07%) ⬆️

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

Impacted Files Coverage Δ
pkg/cluster/executor/ssh.go 64.83% <100.00%> (+64.27%) ⬆️
components/playground/instance/tiflash_config.go 100.00% <0.00%> (ø)
components/playground/instance/instance.go 45.45% <0.00%> (ø)
pkg/cluster/operation/upgrade.go 57.27% <0.00%> (ø)
components/playground/instance/tidb.go 81.25% <0.00%> (ø)
pkg/cluster/operation/telemetry.go 0.00% <0.00%> (ø)
components/playground/instance/tikv_config.go 100.00% <0.00%> (ø)
components/playground/instance/pd.go 73.91% <0.00%> (ø)
components/playground/instance/ticdc.go 0.00% <0.00%> (ø)
...onents/playground/instance/tiflash_proxy_config.go 81.81% <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 ffa74b5...e288ed1. 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 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 Jun 15, 2021
@AstroProfundis AstroProfundis modified the milestones: v1.5.1, v1.6.0 Jun 15, 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: e288ed1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2021
@ti-chi-bot ti-chi-bot merged commit e5e1b46 into pingcap:master Jun 15, 2021
@AstroProfundis AstroProfundis modified the milestones: v1.6.0, v1.5.2 Jun 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 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.

5 participants