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

update proxy of master to raftstore-proxy-6.2 by proxy pr 166/167/168 #5861

Merged
merged 4 commits into from
Sep 13, 2022
Merged

update proxy of master to raftstore-proxy-6.2 by proxy pr 166/167/168 #5861

merged 4 commits into from
Sep 13, 2022

Conversation

CalvinNeo
Copy link
Member

@CalvinNeo CalvinNeo commented Sep 13, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #5855 ref #4982

Problem Summary:
update proxy to raftstore-proxy-6.2
Proxy PR:
pingcap/tidb-engine-ext#166
pingcap/tidb-engine-ext#167
pingcap/tidb-engine-ext#168
Including:\nSubmodule contrib/tiflash-proxy 376a33a80..91c7f1ec2:

encryption: fix issue with opening plaintext files (#12272) (#168)
remove engine_store_ffi out of raftstore (#167)
Support can_apply_snapshot (#166)

What is changed and how it works?

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 13, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • breezewish
  • lidezhu

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-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 13, 2022
@CalvinNeo
Copy link
Member Author

/cc @breezewish @solotzg

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 13, 2022
@CalvinNeo CalvinNeo changed the title update proxy of master to raftstore-proxy-6.2 by proxy pr 166/167/168 update proxy of master to raftstore-proxy-6.2 by proxy pr 0 Sep 13, 2022
@CalvinNeo CalvinNeo changed the title update proxy of master to raftstore-proxy-6.2 by proxy pr 0 update proxy of master to raftstore-proxy-6.2 by proxy pr 166/167/168 Sep 13, 2022
@CalvinNeo
Copy link
Member Author

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Sep 13, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18717      8124             56.60%    216537  83472        61.45%

full coverage report (for internal network access only)

@CalvinNeo CalvinNeo removed the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Sep 13, 2022
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Sep 13, 2022
@CalvinNeo
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

@CalvinNeo: /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.

@CalvinNeo
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

@CalvinNeo: /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.

@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 Sep 13, 2022
@CalvinNeo
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

@CalvinNeo: 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: a8a8687

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 13, 2022
@CalvinNeo
Copy link
Member Author

/rebuild

@CalvinNeo
Copy link
Member Author

/run-integration-test

@sre-bot
Copy link
Collaborator

sre-bot commented Sep 13, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18717      8126             56.58%    216537  83492        61.44%

full coverage report (for internal network access only)

@sre-bot
Copy link
Collaborator

sre-bot commented Sep 13, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18724      8120             56.63%    216768  83397        61.53%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit a6bc771 into pingcap:master Sep 13, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: failed to apply #5861 on top of branch "release-6.1":

[failed to git add conflicting files: exit status 128, failed to git commit: exit status 128]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lidezhu lidezhu lidezhu approved these changes

@hehechen hehechen hehechen approved these changes

@solotzg solotzg solotzg approved these changes

@breezewish breezewish breezewish approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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/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.

Failed to open encryption on rest from plaintext to aes192-ctr
7 participants
@CalvinNeo @ti-chi-bot @sre-bot @breezewish @solotzg @hehechen @lidezhu