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 binpath not work #1545

Merged
merged 3 commits into from
Sep 2, 2021
Merged

fix binpath not work #1545

merged 3 commits into from
Sep 2, 2021

Conversation

nexustar
Copy link
Collaborator

@nexustar nexustar commented Sep 1, 2021

What problem does this PR solve?

when binpath is provided, tiup still download unesserary component, fix #1534

What is changed and how it works?

don't download when binpath is provided,and fix a parameter

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
Copy link
Member

ti-chi-bot commented Sep 1, 2021

[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 requested review from lonng and nrc September 1, 2021 11:08
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 1, 2021
@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2021

Codecov Report

Merging #1545 (f038edd) into master (699add6) will increase coverage by 3.38%.
The diff coverage is 22.22%.

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

@@            Coverage Diff             @@
##           master    #1545      +/-   ##
==========================================
+ Coverage   26.32%   29.71%   +3.38%     
==========================================
  Files         267      248      -19     
  Lines       24098    23809     -289     
==========================================
+ Hits         6345     7074     +729     
+ Misses      16934    15591    -1343     
- Partials      819     1144     +325     
Flag Coverage Δ
dm 26.23% <ø> (?)
integrate 29.71% <22.22%> (+13.50%) ⬆️
playground 13.78% <22.22%> (?)
tiup ?
unittest ?

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

Impacted Files Coverage Δ
components/playground/main.go 46.75% <0.00%> (+44.41%) ⬆️
pkg/exec/run.go 21.17% <33.33%> (-36.97%) ⬇️
pkg/utils/regexp.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
components/dm/ansible/worker.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/telemetry/telemetry.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/utils/hash.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/model/publish.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/store/local.go 0.00% <0.00%> (-82.61%) ⬇️
pkg/utils/semver.go 7.87% <0.00%> (-78.75%) ⬇️
... 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 699add6...c622219. Read the comment docs.

pkg/exec/run.go Outdated
binPath, err = env.BinaryPath(p.Component, selectVer)
if err != nil {
return nil, err
}
}
installPath, _ := filepath.Split(binPath)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better use filepath.Dir() for this usage.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 2, 2021
@AstroProfundis AstroProfundis added this to the v1.5.7 milestone Sep 2, 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: c622219

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 2, 2021
@ti-chi-bot ti-chi-bot merged commit 551e758 into pingcap:master Sep 2, 2021
@nexustar nexustar modified the milestones: v1.5.7, v1.6.0 Sep 2, 2021
@nexustar nexustar deleted the fix_binpath branch September 3, 2021 03:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/M Denotes a PR that changes 30-99 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 shouldn't download component binaries when binpath is provided
4 participants