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

telemetry&util/memory: bump "gopsutil" version to fix a bug that may cause build failure in macOS #28684

Closed
wants to merge 7 commits into from

Conversation

SabaPing
Copy link
Contributor

@SabaPing SabaPing commented Oct 9, 2021

What problem does this PR solve?

Bump gopsutil version to fix a bug that may cause build fail in macOS.

As mentioned in shirou/gopsutil#976, gopsutil with old version did not include TargetConditionals.h and may cause TiDB build failure in macOS.

image

> make vet
vet
GO111MODULE=on go vet -all $(go list ./...| grep -vE "cmd|github.com\/pingcap\/tidb\/tests|github.com\/pingcap\/tidb\/br") 2>&1 | awk '{ print } END { if (NR > 0) { exit 1 } }'
# github.com/shirou/gopsutil/cpu
../../go/pkg/mod/github.com/shirou/gopsutil@v3.21.2+incompatible/cpu/cpu_darwin_cgo.go:13:5: warning: 'TARGET_OS_MAC' is not defined, evaluates to 0 [-Wundef-prefix=TARGET_OS_]
make: *** [vet] Error 1

This PR(shirou/gopsutil#1042) has fixed the issue. And TiDB should catch up this fix.

What is changed and how it works?

Bump gopsutil version in go.mod and go.sum

Release note

NONE

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 9, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 9, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Oct 9, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 9, 2021
@SabaPing SabaPing changed the title [telemetry & util/memory.go] Bump gopsutil version to fix a bug that may cause build fail in macOS telemetry&util/memory.go: Bump gopsutil version to fix a bug that may cause build fail in macOS Oct 9, 2021
@SabaPing SabaPing changed the title telemetry&util/memory.go: Bump gopsutil version to fix a bug that may cause build fail in macOS telemetry: bump gopsutil version to fix a bug that may cause build fail in macOS Oct 9, 2021
@SabaPing
Copy link
Contributor Author

/run-check_dev_2

@sre-bot
Copy link
Contributor

sre-bot commented Oct 11, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@SabaPing SabaPing changed the title telemetry: bump gopsutil version to fix a bug that may cause build fail in macOS telemetry: bump "gopsutil" version to fix a bug that may cause build failure in macOS Oct 11, 2021
@SabaPing SabaPing changed the title telemetry: bump "gopsutil" version to fix a bug that may cause build failure in macOS telemetry&util/memory: bump "gopsutil" version to fix a bug that may cause build failure in macOS Oct 11, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 11, 2021
@SabaPing
Copy link
Contributor Author

/run-check_dev_2

@ti-chi-bot
Copy link
Member

@zhongzc: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@SabaPing
Copy link
Contributor Author

/run-check_dev_2

@crazycs520
Copy link
Contributor

@tangenta @wjhuang2016 PTAL

@tangenta
Copy link
Contributor

/merge

@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@crazycs520: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@crazycs520: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@breezewish
Copy link
Member

gopsutil is also used in https://github.com/pingcap/sysutil /cc @crazycs520

@ti-chi-bot
Copy link
Member

@SabaPing: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 2, 2021
@SabaPing
Copy link
Contributor Author

This problem was fixed by #30523. Closed for now.

@SabaPing SabaPing closed this Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants