Skip to content

Cherry pick sm4#142

Merged
lidezhu merged 15 commits intoraftstore-proxy-6.2from
cherry-pick-sm4
Sep 8, 2022
Merged

Cherry pick sm4#142
lidezhu merged 15 commits intoraftstore-proxy-6.2from
cherry-pick-sm4

Conversation

@lidezhu
Copy link
Collaborator

@lidezhu lidezhu commented Aug 16, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary: cherry pick of tikv#12927

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

jiayang-zheng and others added 5 commits July 18, 2022 15:19
@jiayang-zheng
add sm4 encryption
8b271f8 
Signed-off-by: Jarvis Zheng <jiayang@hust.edu.cn>
@jiayang-zheng @tabokie
Update etc/config-template.toml
bbcf8f6 
Co-authored-by: Xinye Tao <xy.tao@outlook.com>
Signed-off-by: Jarvis Zheng <jiayang@hust.edu.cn>
@BusyJay @ti-chi-bot @jiayang-zheng
*: update jemalloc to 5.3.0 (tikv#12661)
e1d8572 
close tikv#12660

Signed-off-by: Jay Lee <BusyJayLee@gmail.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@jiayang-zheng
Adjust dependencies for SM4 encryption
953f076 
Signed-off-by: Jarvis Zheng <jiayang@hust.edu.cn>
@lidezhu
adapt code to new dependency
9628c04
@CLAassistant
Copy link

CLAassistant commented Aug 16, 2022 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 4 committers have signed the CLA.

✅ lidezhu
✅ CalvinNeo
❌ jiayang-zheng
❌ BusyJay
You have signed the CLA already but the status is still pending? Let us recheck it.

@lidezhu lidezhu mentioned this pull request Aug 16, 2022
Closed
12 tasks
@lidezhu lidezhu force-pushed the cherry-pick-sm4 branch 2 times, most recently from 988252a to 9628c04 Compare August 16, 2022 09:35
CalvinNeo
CalvinNeo reviewed Aug 16, 2022
View reviewed changes
@CalvinNeo CalvinNeo self-requested a review September 7, 2022 08:51
CalvinNeo
CalvinNeo approved these changes Sep 7, 2022
View reviewed changes
Copy link
Member

@CalvinNeo CalvinNeo left a comment

Choose a reason for hiding this comment

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

lgtm

@CalvinNeo
Copy link
Member

CalvinNeo commented Sep 7, 2022 •
edited
Loading

It compiles #161, if we just run these two

cargo test --package tests --test proxy normal::store
cargo test --package tests --test proxy proxy

Since we have noticed in failed run

2022-09-07T12:39:03.3004142Z test cases::test_merge::test_merge_election_and_restart ... ok
2022-09-07T12:39:04.9594125Z test cases::test_merge::test_merge_pessimistic_locks_propose_fail ... ok
2022-09-07T12:39:06.6658756Z test cases::test_merge::test_merge_pessimistic_locks_with_concurrent_prewrite ... ok
2022-09-07T12:39:07.9850167Z test cases::test_merge::test_merge_with_concurrent_pessimistic_locking ... ok
2022-09-07T12:39:09.4607278Z test cases::test_merge::test_node_failed_merge_before_succeed_merge ... ok
2022-09-07T12:39:10.5816694Z test cases::test_merge::test_node_merge_cascade_merge_with_apply_yield ... ok
2022-09-07T12:39:11.9267893Z test cases::test_merge::test_node_merge_catch_up_logs_leader_election ... ok
2022-09-07T12:39:15.8692784Z test cases::test_merge::test_node_merge_catch_up_logs_no_need ... ok
2022-09-07T12:39:16.6930253Z test cases::test_merge::test_node_merge_catch_up_logs_restart ... ok
2022-09-07T12:39:18.0882430Z test cases::test_merge::test_node_merge_crash_before_snapshot_then_catch_up_logs ... ok
2022-09-07T12:39:21.7773265Z test cases::test_merge::test_node_merge_crash_when_snapshot ... ok
2022-09-07T12:39:24.0349623Z test cases::test_merge::test_node_merge_multiple_snapshots_not_together ... ok
2022-09-07T12:39:26.2794137Z test cases::test_merge::test_node_merge_multiple_snapshots_together ... ok
2022-09-07T12:39:29.5354972Z test cases::test_merge::test_node_merge_recover_snapshot ... ok
2022-09-07T12:39:31.3359905Z test cases::test_merge::test_node_merge_restart ... ok
2022-09-07T12:39:32.4962158Z test cases::test_merge::test_node_merge_restart_after_apply_premerge_before_apply_compact_log ... ok
2022-09-07T12:39:36.3183283Z test cases::test_merge::test_node_merge_rollback ... ok
2022-09-07T12:39:37.2580543Z test cases::test_merge::test_node_merge_transfer_leader ... ok
2022-09-07T12:39:38.5871725Z test cases::test_merge::test_node_merge_write_data_to_source_region_after_merging ... ok
2022-09-07T12:39:40.3785568Z test cases::test_merge::test_node_multiple_rollback_merge ... ok
2022-09-07T12:39:41.4501365Z test cases::test_merge::test_prewrite_before_max_ts_is_synced ... ok
2022-09-07T12:39:42.7610457Z test cases::test_merge::test_retry_pending_prepare_merge_fail ... ok
2022-09-07T12:39:43.3550686Z test cases::test_merge::test_source_peer_read_delegate_after_apply ... ok
2022-09-07T12:39:43.3551411Z 
2022-09-07T12:39:43.3551915Z test result: ok. 23 passed; 0 failed; 0 ignored; 0 measured; 166 filtered out; finished in 42.76s

I think this failure is because we exceed what GitHub Action's runner can afford.

Maybe we can split this ci check into two.

@CalvinNeo CalvinNeo mentioned this pull request Sep 8, 2022
Merged
12 tasks
@lidezhu lidezhu merged commit d89b9d3 into raftstore-proxy-6.2 Sep 8, 2022
@lidezhu lidezhu deleted the cherry-pick-sm4 branch September 8, 2022 06:53
@lidezhu lidezhu restored the cherry-pick-sm4 branch September 8, 2022 06:56
@lidezhu lidezhu deleted the cherry-pick-sm4 branch September 8, 2022 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CalvinNeo CalvinNeo CalvinNeo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lidezhu @CLAassistant @CalvinNeo @jiayang-zheng @BusyJay