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

*: avoid mutually exclusive features in pprof #12589

Merged
merged 9 commits into from May 25, 2022

Conversation

mornyx
Copy link
Contributor

@mornyx mornyx commented May 20, 2022

Signed-off-by: mornyx mornyx.z@gmail.com

What's changed

Issue Number: Close #12590

In #12480, we have introduced two mutually exclusive features, pprof-dwarf and pprof-fp. One of them must exist, otherwise a compilation error will occur. This introduces stricter requirements for feature usage in some modules.

We need to relax them and keep only one pprof-fp, anything else should automatically fallback to DWARF-based.

Related PR

Release note

None

Signed-off-by: mornyx <mornyx.z@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 20, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • sticnarf
  • zhongzc

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.

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/cc @sticnarf PTAL, thanks. Avoiding the mutex feature can avoid compilation errors in many scenarios.

@ti-chi-bot ti-chi-bot added the status/LGT1 Status: PR - There is already 1 approval label May 24, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels May 24, 2022
@zhongzc
Copy link
Contributor

zhongzc commented May 24, 2022

/merge

@ti-chi-bot
Copy link
Member

@zhongzc: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

@ti-chi-bot
Copy link
Member

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

Commit hash: 1d4ad34

@ti-chi-bot ti-chi-bot added the status/can-merge Status: Can merge to base branch label May 24, 2022
@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

6 similar comments
@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@mornyx
Copy link
Contributor Author

mornyx commented May 24, 2022

/run-test

@ti-chi-bot
Copy link
Member

@mornyx: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

Signed-off-by: mornyx <mornyx.z@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Status: Can merge to base branch label May 25, 2022
@zhongzc
Copy link
Contributor

zhongzc commented May 25, 2022

/merge

@ti-chi-bot
Copy link
Member

@zhongzc: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

@ti-chi-bot
Copy link
Member

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

Commit hash: 99e0e44

@ti-chi-bot ti-chi-bot added the status/can-merge Status: Can merge to base branch label May 25, 2022
@mornyx
Copy link
Contributor Author

mornyx commented May 25, 2022

/run-test

1 similar comment
@zhongzc
Copy link
Contributor

zhongzc commented May 25, 2022

/run-test

@ti-chi-bot ti-chi-bot merged commit b448e81 into tikv:master May 25, 2022
@mornyx mornyx deleted the optimize-features branch May 25, 2022 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution Type: PR - From contributors release-note-none size/S status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Avoid mutually exclusive features
4 participants