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

raw_restore: fix the issue that raw restore rewrite the t prefix keys #35641

Merged
merged 8 commits into from
Jun 23, 2022
Merged

raw_restore: fix the issue that raw restore rewrite the t prefix keys #35641

merged 8 commits into from
Jun 23, 2022

Conversation

3pointer
Copy link
Contributor

@3pointer 3pointer commented Jun 22, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #35279

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)
    before this PR

image

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

fix the issue that raw restore rewrite the t prefix keys

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 22, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • glorv
  • pingyu

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 do-not-merge/needs-triage-completed release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 22, 2022
@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@sre-bot
Copy link
Contributor

sre-bot commented Jun 22, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/dcfc9c7b210136c7a89d4ffe783053e31e9a18a8

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-6.0 needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-triage-completed labels Jun 22, 2022
@3pointer 3pointer marked this pull request as ready for review June 22, 2022 13:05
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 22, 2022
@3pointer
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 26a09ac

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 23, 2022
@ti-chi-bot ti-chi-bot merged commit fde7c36 into pingcap:master Jun 23, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.0
0ff8b64 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Closed
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #35691

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.1
89d593e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Closed
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #35692

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.2
8e49aec 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Closed
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #35693

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.3
46373aa 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Closed
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #35694

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.4
704fada 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Merged
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #35695

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-6.0
9439454 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Closed
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #35696

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 23, 2022
@3pointer @ti-srebot
cherry pick pingcap#35641 to release-6.1
fc2f6f4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Merged
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #35697

@sre-bot
Copy link
Contributor

sre-bot commented Jun 23, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟥 failed 1, success 34, total 35 1 hr 11 min New failing
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 1, success 10, total 11 35 min Existing failure
idc-jenkins-ci-tidb/tics-test 🔴 failed 1, success 0, total 1 5 min 33 sec Existing failure
idc-jenkins-ci-tidb/integration-ddl-test ✅ all 6 tests passed 14 min Fixed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 9 min 17 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 58 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 4 min 43 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 15 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot pushed a commit that referenced this pull request Jun 24, 2022
@ti-srebot
raw_restore: fix the issue that raw restore rewrite the t prefix keys (…
73df8da 
…#35641) (#35695)

close #35279
morgo added a commit to morgo/tidb that referenced this pull request Jun 24, 2022
@morgo
Merge remote-tracking branch 'upstream/master' into add-bootstrap-sql
a0769dc 
* upstream/master: (38 commits)
  planner: disable collate clause support for enum or set column (pingcap#35684)
  *: Provide a util to "pause" session in uint test (pingcap#35529)
  ddl: implement the core for multi-schema change (pingcap#35429)
  parser: XXXDatabaseStmt now use CIStr for DB name (pingcap#35668)
  *: remove real tikv test on github actions (pingcap#35710)
  lightning: support disable scheduler by key range (pingcap#34130)
  Revert "planner: fix the wrong cost formula of MPPExchanger" (pingcap#35707)
  ddl, owner: refresh ddl sequence cache after becoming the owner (pingcap#35516)
  store/copr: fix tiflash integration test by disable paging on tiflash (pingcap#35674)
  planner: new cost formula for IndexJoin (pingcap#35671)
  BR: fix backup ranges total time summary log (pingcap#35552)
  raw_restore: fix the issue that raw restore rewrite the t prefix keys (pingcap#35641)
  table: fix cannot find the temp table when it's created in a transaction (pingcap#35663)
  metrics: replace histogram with counter for  DistSQLCoprCache (pingcap#35514)
  *: enable exportloopref  (pingcap#35680)
  types: fix bad error message for numeric conversion issue#32744 (pingcap#34047)
  *: enable ineffassign (pingcap#35670)
  config, sysvar: map `max-server-connections` to `max_connections` (pingcap#35453)
  *: enable durationcheck for nogo linter (pingcap#35661)
  *: fix issue of cast string as time is incompatible with MySQL (pingcap#35455)
  ...
ti-chi-bot pushed a commit that referenced this pull request Aug 20, 2022
@ti-srebot
raw_restore: fix the issue that raw restore rewrite the t prefix keys (…
2798dba 
…#35641) (#35697)

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

@pingyu pingyu pingyu approved these changes

@glorv glorv glorv approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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.

BR tool ErrRestoreTableIDMismatch error when using raw kv mode
6 participants
@3pointer @ti-chi-bot @sre-bot @ti-srebot @pingyu @glorv