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: fix wrong keys detecting host arch #1610

Merged
merged 2 commits into from
Nov 11, 2021

Conversation

AstroProfundis
Copy link
Contributor

What problem does this PR solve?

Introduced in #1423

$ tiup cluster deploy aws-test-v530 v5.3.0 topo.yaml -i id_rsa -u centos
Starting component `cluster`: /home/centos/.tiup/components/cluster/v1.6.0/tiup-cluster deploy aws-test-v530 v5.3.0 topo.yaml -i id_rsa -u centos





+ Detect CPU Arch
  - Detecting node 172.31.38.22 ... ⠼ Shell: host=172.31.38.22, sudo=false, command=`uname -m`
  - Detecting node 172.31.40.219 ... ⠼ Shell: host=172.31.40.219, sudo=false, command=`uname -m`
+ Detect CPU Arch
+ Detect CPU Arch
  - Detecting node 172.31.38.22 ... Done
  - Detecting node 172.31.40.219 ... Done
  - Detecting node 172.31.46.81 ... Done
  - Detecting node 172.31.42.64 ... Done
  - Detecting node 172.31.37.178 ... Done
  - Detecting node 172.31.36.128 ... Done
  - Detecting node 172.31.34.177 ... Done
  - Detecting node 172.31.41.3 ... Done
  - Detecting node 172.31.36.51 ... Done

Error: no check results found for 172.31.47.49

Verbose debug logs has been written to /home/centos/.tiup/logs/tiup-cluster-debug-2021-11-04-09-09-08.log.
Error: run `/home/centos/.tiup/components/cluster/v1.6.0/tiup-cluster` (wd:/home/centos/.tiup/data/SnmiNyB) failed: exit status 1

While 172.31.47.79 is the console machine itself and has multiple instances defined on it in the topology.

What is changed and how it works?

When detecting host arch, empty value should not be added to the host set before checking of the value of its arch field.

Check List

Tests

  • Manual test (add detailed scripts or steps below)

Related changes

  • Need to cherry-pick to the release branch

Release notes:

NONE

@AstroProfundis AstroProfundis added this to the v1.6.2 milestone Nov 4, 2021
@AstroProfundis AstroProfundis self-assigned this Nov 4, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 4, 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 4, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 4, 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: 8fdff78

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 11, 2021
@codecov-commenter
Copy link

codecov-commenter commented Nov 11, 2021

Codecov Report

Merging #1610 (11b51ef) into master (109ebff) will decrease coverage by 2.23%.
The diff coverage is n/a.

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

@@            Coverage Diff             @@
##           master    #1610      +/-   ##
==========================================
- Coverage   15.71%   13.47%   -2.24%     
==========================================
  Files         149      154       +5     
  Lines       15097    15651     +554     
==========================================
- Hits         2372     2109     -263     
- Misses      12208    13140     +932     
+ Partials      517      402     -115     
Flag Coverage Δ
integrate 13.47% <ø> (-2.24%) ⬇️
playground 13.47% <ø> (?)
tiup ?
unittest ?

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

Impacted Files Coverage Δ
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
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/telemetry/telemetry.go 0.00% <0.00%> (-66.67%) ⬇️
pkg/repository/v1manifest/keys.go 5.33% <0.00%> (-58.67%) ⬇️
pkg/repository/merge_mirror.go 0.00% <0.00%> (-58.51%) ⬇️
pkg/utils/args.go 0.00% <0.00%> (-50.00%) ⬇️
pkg/repository/store/txn.go 0.00% <0.00%> (-49.67%) ⬇️
pkg/repository/model/model.go 0.00% <0.00%> (-47.52%) ⬇️
... and 60 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 109ebff...ba156bc. Read the comment docs.

@AstroProfundis AstroProfundis modified the milestones: v1.6.2, v1.7.0 Nov 11, 2021
@ti-chi-bot ti-chi-bot merged commit ab0e748 into pingcap:master Nov 11, 2021
@AstroProfundis AstroProfundis deleted the fix-arch-detect branch November 18, 2021 07:04
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