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.

Sign up for GitHub

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

Jump to bottom

Bundle grpc/protobuf curl zlib ssl in release-5.0 (#3896) (#3901) (#3974) (#3987) #4600

Merged
merged 4 commits into from
May 11, 2022
Merged

Bundle grpc/protobuf curl zlib ssl in release-5.0 (#3896) (#3901) (#3974) (#3987) #4600

merged 4 commits into from
May 11, 2022

Conversation

LittleFall
Copy link
Contributor

the cherry-pick of #4211

What problem does this PR solve?

Issue Number: close #4196

Problem Summary:

What is changed and how it works?

Reference: grpc/grpc#23144

Change to use boringssl.

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix the potential crash issue that occurs when TLS is enabled

zanmato1984 and others added 2 commits April 7, 2022 05:40
@zanmato1984 @LittleFall
Bundle grpc/protobuf in tiflash (pingcap#3896)
160ceac 
Fully rename project to tiflash (pingcap#3901)

Conflicts:
	libs/libdaemon/cmake/find_unwind.cmake

Remove useless curl dependency (pingcap#3974)

Bundle all dependencies: zlib, openssl and curl (pingcap#3987)

Conflicts:
	contrib/poco

update contrib/poco

update ci/cd process

Signed-off-by: Zhigao Tong <tongzhigao@pingcap.com>

fix zlib-ng

Signed-off-by: Zhigao Tong <tongzhigao@pingcap.com>

extra fix

formatted

fix: remove dttool, unify definition

fix: add functions

fix: replace ClickHouse to TiFlash

fix: update dtpb cmake

fix: compile issue

fmt

fix: gtests

fix: gtests scripts
@LittleFall
fix: remove dtpb
9926d32
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 6, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • solotzg
  • zanmato1984

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. do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 6, 2022
@LittleFall
Copy link
Contributor Author

/run-all-tests

1 similar comment
@LittleFall
Copy link
Contributor Author

/run-all-tests

@LittleFall
Copy link
Contributor Author

/run-unit-test

@LittleFall
Copy link
Contributor Author

/run-integration-test

@LittleFall
Copy link
Contributor Author

current integration-test will set ENABLE_TESTS=false and ENABLE_FAILPOINTS=true, release-5.0 need failpoints but it can't recognize ENABLE_FAILPOINTS, needs to cherry-pick #2296 first to pass the ci.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 7, 2022
solotzg
solotzg requested changes Apr 11, 2022
View reviewed changes
Copy link
Contributor

@solotzg solotzg left a comment

Choose a reason for hiding this comment

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

integration-test failed

@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 11, 2022
zanmato1984
zanmato1984 approved these changes Apr 11, 2022
View reviewed changes
Copy link
Contributor

@zanmato1984 zanmato1984 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 11, 2022
@LittleFall
Copy link
Contributor Author

/run-all-tests

@LittleFall LittleFall requested a review from solotzg April 11, 2022 12:13
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 11, 2022
@zanmato1984
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zanmato1984: 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: 9bdac2a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 22, 2022
@solotzg
Copy link
Contributor

solotzg commented May 5, 2022

/rebuild

@solotzg
Copy link
Contributor

solotzg commented May 5, 2022

/run-all-tests

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 11, 2022
@zanmato1984
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zanmato1984: 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 ti-chi-bot merged commit 94609a6 into pingcap:release-5.0 May 11, 2022
@LittleFall LittleFall deleted the cherrypick/4196-in-5.0 branch May 18, 2022 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SchrodingerZhu SchrodingerZhu SchrodingerZhu approved these changes

@solotzg solotzg solotzg approved these changes

@zanmato1984 zanmato1984 zanmato1984 approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@LittleFall @ti-chi-bot @zanmato1984 @solotzg @SchrodingerZhu @VelocityLight