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

proto: update proto name and remove conflictPolicy #1085

Merged
merged 2 commits into from
Nov 1, 2021

Conversation

lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Nov 1, 2021

What problem does this PR solve?

New prometheus insist that proto files should have different names, so #1083 introduces ldflags LDFLAGS += -X "google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" for drainer to avoid panic.

What is changed and how it works?

Solve the protocol buffer namespace conflict problem. Similar to pingcap/tidb-tools#541

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Release note

  • No release note

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 1, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • glorv

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.

@sre-bot
Copy link

sre-bot commented Nov 1, 2021

@lichunzhu
Copy link
Contributor Author

/rebuild

@lichunzhu
Copy link
Contributor Author

/run-all-tests

@lichunzhu
Copy link
Contributor Author

/run-all-tests

Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

@rleungx: 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:

LGTM

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.

@lichunzhu
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 804eb54

@lichunzhu
Copy link
Contributor Author

/rebuild

@ti-chi-bot ti-chi-bot merged commit c032e8b into pingcap:master Nov 1, 2021
@lichunzhu lichunzhu deleted the updateProto branch November 1, 2021 13:51
@dveeden dveeden mentioned this pull request Nov 17, 2021
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants