Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

*: cherry-picking some PRs for v4.0.8#562

Merged
YuJuncen merged 5 commits intopingcap:release-4.0from
YuJuncen:generic-cp-4.0.8
Oct 23, 2020
Merged

*: cherry-picking some PRs for v4.0.8#562
YuJuncen merged 5 commits intopingcap:release-4.0from
YuJuncen:generic-cp-4.0.8

Conversation

@YuJuncen
Copy link
Collaborator

@YuJuncen YuJuncen commented Oct 21, 2020

What problem does this PR solve?

cherry-picking #452, #427, #559 to release-4.0.

What is changed and how it works?

N/A

Check List

Tests

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

Release Note

overvenus and others added 4 commits October 21, 2020 16:50
@overvenus @YuJuncen
*: remove in-struct context (pingcap#452)
e167635 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@YuJuncen
*: mannully fix conflict
06fe1dd
@YuJuncen
restore: make split and restore pipelined. (pingcap#427)
fbcefe1 
Signed-off-by: Hillium <maruruku@stu.csust.edu.cn>
@YuJuncen @kennytm @overvenus
*: when cleaning up, use isolated context (pingcap#559)
b1310f8 
* *: when cleaning up, use isolated context

* glue: add a guard for Inc

* tests: add some debug log

* tests: fix tests

* *: use background context directly

* makefile: don't use trap

* Apply suggestions from code review

Co-authored-by: kennytm <kennytm@gmail.com>
Co-authored-by: Neil Shen <overvenus@gmail.com>

* glue: add a TODO

Co-authored-by: kennytm <kennytm@gmail.com>
Co-authored-by: Neil Shen <overvenus@gmail.com>
@YuJuncen
Copy link
Collaborator Author

YuJuncen commented Oct 21, 2020

/run-integration-test

@overvenus
Copy link
Member

overvenus commented Oct 22, 2020

LGTM

@ti-srebot ti-srebot added the status/LGT1 LGTM1 label Oct 22, 2020
@overvenus
Copy link
Member

overvenus commented Oct 22, 2020

Is it still WIP?

@YuJuncen
Copy link
Collaborator Author

YuJuncen commented Oct 22, 2020 •
edited
Loading

Is it still WIP?

waiting for #555 and #561 if possible

@YuJuncen
pd: disable location replacement (pingcap#555)
fbd0a13 
Signed-off-by: Hillium <maruruku@stu.csust.edu.cn>
@YuJuncen
Copy link
Collaborator Author

YuJuncen commented Oct 22, 2020

/run-integration-test

@kennytm
Copy link
Collaborator

kennytm commented Oct 22, 2020

/run-integration-test

https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/br_ghpr_unit_and_integration_test/detail/br_ghpr_unit_and_integration_test/3462/pipeline

[2020-10-22T16:48:26.116Z] ERROR 1146 (42S02) at line 1: Table 'br_history1.usertable' doesn't exist

[2020-10-22T16:48:26.116Z] ERROR 1146 (42S02) at line 1: Table 'br_history2.usertable' doesn't exist

[2020-10-22T16:48:26.116Z] TEST: [br_history] fail on database br_history1

[2020-10-22T16:48:26.116Z] database br_history1 [original] row count: 1000, [after br] row count: 

[2020-10-22T16:48:26.116Z] TEST: [br_history] fail on database br_history2

[2020-10-22T16:48:26.116Z] database br_history2 [original] row count: 1000, [after br] row count: 

[2020-10-22T16:48:26.116Z] database br_history3 [original] row count: 1000, [after br] row count: 1000

3pointer
3pointer approved these changes Oct 23, 2020
View reviewed changes
Copy link
Collaborator

@3pointer 3pointer 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-srebot ti-srebot removed the status/LGT1 LGTM1 label Oct 23, 2020
@ti-srebot ti-srebot added the status/LGT2 LGTM2 label Oct 23, 2020
@YuJuncen YuJuncen merged commit 2e8038f into pingcap:release-4.0 Oct 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@3pointer 3pointer 3pointer approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/LGT2 LGTM2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@YuJuncen @overvenus @kennytm @3pointer @ti-srebot