Skip to content

Revert snapshot on release-5.0 branch#2121

Merged
JaySon-Huang merged 6 commits intopingcap:release-5.0from
JaySon-Huang:revert_snapshot
Jun 8, 2021
Merged

Revert snapshot on release-5.0 branch#2121
JaySon-Huang merged 6 commits intopingcap:release-5.0from
JaySon-Huang:revert_snapshot

Conversation

@JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Jun 8, 2021

What problem does this PR solve?

Rollback "Apply snapshot optimization" for v5.0.2 because we find #2118 that will make TiFlash crash when a table "pk is handle" is true.

What is changed and how it works?

Revert #2070, #2074 that should not bring to v5.0.2.
Revert #1867 and its following bug-fixes #2048, #2055 from v5.0.2

Note that #2070, #2074 will be restored after this PR merged.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch:

Check List

Tests

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

Side effects

Release note

…ap#1439) (pingcap#1867)"

This reverts commit c947fd6.

 Conflicts:
	dbms/src/Common/FailPoint.cpp
	dbms/src/Storages/DeltaMerge/File/DMFileBlockOutputStream.h
	dbms/src/Storages/DeltaMerge/File/DMFileWriter.h
	dbms/src/Storages/DeltaMerge/ReorganizeBlockInputStream.h
	dbms/src/Storages/DeltaMerge/SSTFilesToBlockInputStream.cpp
	dbms/src/Storages/DeltaMerge/SSTFilesToBlockInputStream.h
	dbms/src/Storages/DeltaMerge/SSTFilesToDTFilesOutputStream.cpp
	dbms/src/Storages/DeltaMerge/Segment.cpp
	dbms/src/Storages/DeltaMerge/StableValueSpace.cpp
	dbms/src/Storages/DeltaMerge/tests/gtest_dm_file.cpp
	dbms/src/Storages/DeltaMerge/tests/gtest_dm_storage_delta_merge.cpp
	dbms/src/Storages/StorageDeltaMerge.cpp
	dbms/src/Storages/StorageDeltaMerge.h
	dbms/src/Storages/Transaction/ApplySnapshot.cpp
	dbms/src/Storages/Transaction/PartitionStreams.cpp
	tests/delta-merge-test/raft/schema/drop_on_restart.test
@JaySon-Huang JaySon-Huang requested a review from flowbehappy June 8, 2021 14:57
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Jun 8, 2021

We review this PR by:
Create a branch that only picks the commits we need at: https://github.com/flowbehappy/tics/tree/release-5.0-pick2
Merge this branch(revert_snapshot) into the branch release-5.0-pick2, we can check the diff by this commit: JaySon-Huang@8b2842a or this patch file jayson_diff_flowbehappy_pick2.patch.zip

@JaySon-Huang JaySon-Huang changed the title [DNM] Revert snapshot Revert snapshot on release-5.0 branch Jun 8, 2021
@JaySon-Huang JaySon-Huang added the CHERRY-PICK cherry pick label Jun 8, 2021
Copy link
Contributor

@flowbehappy flowbehappy 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 added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 8, 2021
@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

@JaySon-Huang JaySon-Huang merged commit 4410e7b into pingcap:release-5.0 Jun 8, 2021
@JaySon-Huang JaySon-Huang deleted the revert_snapshot branch July 6, 2021 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CHERRY-PICK cherry pick status/LGT1 Indicates that a PR has LGTM 1.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants