Skip to content

storage: handle IngestSST using segment split#6378

Merged
ti-chi-bot merged 26 commits intopingcap:masterfrom
breezewish:wenxuan/ingest-by-split-2
Dec 1, 2022
Merged

storage: handle IngestSST using segment split#6378
ti-chi-bot merged 26 commits intopingcap:masterfrom
breezewish:wenxuan/ingest-by-split-2

Conversation

@breezewish
Copy link
Member

@breezewish breezewish commented Nov 29, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #5237

This is the final PR for #5237. After this one, everything should be finished.

Problem Summary:

What is changed and how it works?

Some changes are extracted:

  1. Add: Segment::prepareIngestData and Segment::applyIngestData.

    It checks whether the segment is empty, and will call either replaceData or ingestIntoDelta.

    • Unit tests included.

  2. Add DeltaMergeStore::segmentIngestData API.

    It calls Segment::prepareIngestData and Segment::applyIngestData.

  3. Change the workflow of DeltaMergeStore::ingestFiles. Changes as below:

    - 1. for clear_data=false, use `ingestIntoDelta` API. Otherwise, for clear_data=true:
  
  2. Logical-split the segment according to the range of the data to ingest

- 3. Use `DeltaMergeStore::replaceData` API.
+ 3. Use `DeltaMergeStore::segmentIngestData` API.

  4. Add tests for concurrent ingest data.

  5. Changed existing StoreIngestTest to test for both ingestBySplit and ingestByDelta.

Check List

Tests

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

Workload 1: Import data using BR on IDC. When all TiFlash replicas are ready, invoke 3 full table scans with 30s interval.

Metric This PR master release-6.1
CPU during BR restore 600% 1300% 304%
Disk space 40.3GB 49GB (see #5950) 40.4GB
Max disk space 41.3GB 62.6GB 46.5GB
Write amp 0.33 1.58 2.34
Peak write 136MiB/s 463MiB/s 157MiB/s
Total workload time 11min 14min 53min
TiFlash replica ready time after BR 0min 0min 41min
Query time 0 16.22 17.07 24.65
Query time 1 13.28 15.70 23.47
Query time 2 12.28 14.46 23.95

Workload 2: Import CHBenchmark (warehouse=1000) data using BR on AWS EC2. When all TiFlash replicas are ready, invoke 3 full table scans with 30s interval.

Metric This PR master release-6.1
CPU during BR restore 126% 288% 204%
Disk space 53.1GB 53.4GB 53.3GB
Max disk space 53.1GB 67.2GB 61.6GB
Write amp 0.68 4.51 6.91
Peak write 41MiB/s 253MiB/s 249MiB/s
Total workload time 34min 37min 59min
TiFlash replica ready time after BR 0min 0min 20min
Query time 0 1 min 5.96 sec 1 min 5.98 sec 1 min 6.49 sec
Query time 1 1 min 5.94 sec 1 min 5.96 sec 1 min 4.97 sec
Query time 2 1 min 5.93 sec 1 min 5.98 sec 1 min 6.48 sec
  • 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

Reduce resource usage when import using BR / Lightning

@breezewish
Pick impl from older branch
97e1f08 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Check external files are not overlapped in ingestFiles
678f40f
@breezewish
Fix tests
39d2917 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
storage: Add more checks for ingest
1b97371 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Merge remote-tracking branch 'origin/master' into wenxuan/ingest_chec…
09aee07 
…k_not_overlap
@breezewish
Reformat
a91ded3 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Revert the segment abandon change
9a3e9d4 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Merge remote-tracking branch 'origin/master' into wenxuan/ingest-by-s…
52b7427 
…plit-2

Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Merge commit 'a91ded340ded7a19629e355e43b0d1784b62bbf7' into wenxuan/…
85b6ac2 
…ingest-by-split-2

Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Address comments
8514195 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Cherry pick upstream changes
cab390b 
Signed-off-by: Wish <breezewish@outlook.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 29, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JaySon-Huang
  • flowbehappy

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.

Details

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 Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 29, 2022
breezewish and others added 3 commits November 29, 2022 12:09
@breezewish breezewish mentioned this pull request Nov 29, 2022
Merged
12 tasks
@breezewish
Merge branch 'master' into wenxuan/replace_data_snapshot
52cf4be
@breezewish
Merge commit '640b3974c6aa6880d4a65dcfd9b75714b9408ca8' into wenxuan/…
5648b3c 
…ingest-by-split-2
@breezewish
Fix typos
edd09e4 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Merge commit '52cf4be99306a6b4aef4e46a2fdae057bdfb499f' into wenxuan/…
37c7eba 
…ingest-by-split-2

Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Merge commit 'f57ec4be15f1eb3a5e459fe5850b2a1b6ce678d9' into wenxuan/…
2e7122d 
…ingest-by-split-2

Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Fix merge issue
64b1e94 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Add concurrent write & ingest test
49064f4 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Add debug logs
1a1f7eb 
Signed-off-by: Wish <breezewish@outlook.com>
breezewish
breezewish commented Nov 30, 2022
View reviewed changes
dbms/src/Storages/DeltaMerge/Delta/DeltaValueSpace.h
// Protects the operations in this instance.
mutable std::mutex mutex;
// It is a recursive_mutex because the lock may be also used by the parent segment as its update lock.
mutable std::recursive_mutex mutex;
Copy link
Member Author

@breezewish breezewish Nov 30, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Note: This recursive mutex happens when:

  1. DeltaMergeStore::segmentIngestData grabs a segment update lock
  2. DeltaMergeStore::segmentIngestData discovered the segment is not empty and then ingest files into the delta.
    • DeltaValueSpace::ingestColumnFiles grabs the same lock to write to delta VS.

The real problem is we do not distinguish the segment update lock with the delta lock. When both lock is needed, they are conflicted. Also, I did not changed the ingestColumnFiles API to allow passing an external lock, because other APIs in the DeltaVS do not have this pattern and I think it may not be a good idea.

Copy link
Contributor

@JaySon-Huang JaySon-Huang Dec 1, 2022

Choose a reason for hiding this comment

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

Usually, in DeltaMergeStore::segmentApplyXXX we will acquire the segment update lock and won't change the DeltaVS inside the "apply".
segmentIngestData brings a special pattern that may change the DeltaVS inside its "apply". But I didn't figure out a better solution

JaySon-Huang
JaySon-Huang reviewed Nov 30, 2022
View reviewed changes
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

Rest lgtm

@breezewish
Address comments
f093c49 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Unify the name of splitByIngest and splitByReplace (they are the same)
d631a73 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Copy link
Member Author

breezewish commented Dec 1, 2022

/run-all-tests

JaySon-Huang
JaySon-Huang approved these changes Dec 1, 2022
View reviewed changes
Copy link
Contributor

@JaySon-Huang JaySon-Huang 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 1, 2022
@breezewish breezewish linked an issue Dec 1, 2022 that may be closed by this pull request
Reclaim ColumnFileBig that cannot be contained by any segment #5950
Closed
@breezewish
storage: Simplify segmentIngestData
e4b5c02 
Signed-off-by: Wish <breezewish@outlook.com>
@breezewish
Copy link
Member Author

breezewish commented Dec 1, 2022

/run-all-tests

@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 Dec 1, 2022
@flowbehappy
Copy link
Contributor

flowbehappy commented Dec 1, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 1, 2022

@flowbehappy: 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.

Details

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

ti-chi-bot commented Dec 1, 2022

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

DetailsCommit hash: 742f389

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 1, 2022
@ti-chi-bot ti-chi-bot merged commit 331d495 into pingcap:master Dec 1, 2022
@breezewish breezewish deleted the wenxuan/ingest-by-split-2 branch December 1, 2022 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@flowbehappy flowbehappy flowbehappy approved these changes

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees

No one assigned

Labels

release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ 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.

Reclaim ColumnFileBig that cannot be contained by any segment Big region snapshot adaption and applying snapshot improvement

4 participants

@breezewish @ti-chi-bot @flowbehappy @JaySon-Huang