PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" #4987

JaySon-Huang · 2022-05-24T07:00:51Z

What problem does this PR solve?

Issue Number: close #4957, close #4986

Problem Summary:

issue 4975:
- We can not prevent being_ref_count to be modify unless we stop the write threads while dumping snapshot of WAL log files
issue 4986:
- The encryption info of WAL log files are not removed after snapshot dumped

What is changed and how it works?

Create a reader for WAL log files and load the edit into another temporary PageDirectory instance, and dump it as a snapshot edit to the snapshot log file
Remove the encryption info of WAL log files after snapshot dumped

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

Release note

None

ti-chi-bot · 2022-05-24T07:00:53Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

jiaqizho
lidezhu

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.

JaySon-Huang · 2022-05-24T07:22:46Z

dbms/src/Storages/Page/V3/WALStore.cpp

+        const auto log_fullname = filename.fullname(LogFileStage::Normal);
+        provider->deleteRegularFile(log_fullname, EncryptionPath(log_fullname, ""));


dbms/src/Storages/Page/V3/PageDirectory.cpp

dbms/src/Storages/Page/V3/WALStore.cpp

Signed-off-by: JaySon-Huang <[email protected]>

JaySon-Huang · 2022-05-24T08:29:03Z

/run-all-tests

JaySon-Huang · 2022-05-24T08:29:21Z

Addressed, PTAL again @jiaqizho

jiaqizho

LGTM

JaySon-Huang · 2022-05-24T09:18:56Z

/merge

ti-chi-bot · 2022-05-24T09:18:57Z

@JaySon-Huang: 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.

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 · 2022-05-24T09:18:58Z

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

Commit hash: 158403c

JaySon-Huang · 2022-05-24T10:21:42Z

/merge

ti-chi-bot · 2022-05-24T10:21:43Z

@JaySon-Huang: 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.

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 · 2022-05-24T10:21:44Z

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

Commit hash: 6bc27c0

sre-bot · 2022-05-24T10:41:55Z

Coverage for changed files

Filename                                            Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/FileProvider.cpp                              82                12    85.37%          11                 0   100.00%         144                34    76.39%          62                16    74.19%
Encryption/FileProvider.h                                 2                 0   100.00%           2                 0   100.00%           2                 0   100.00%           0                 0         -
Encryption/MockKeyManager.cpp                            64                 6    90.62%           7                 0   100.00%          81                 9    88.89%          36                11    69.44%
Encryption/MockKeyManager.h                               1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
Storages/DeltaMerge/StoragePool.cpp                     224               108    51.79%          31                 8    74.19%         491               220    55.19%         146                85    41.78%
Storages/Page/PageStorage.h                              19                 1    94.74%          19                 1    94.74%          85                 3    96.47%           0                 0         -
Storages/Page/V3/PageDirectory.cpp                      565                89    84.25%          32                 1    96.88%        1132               173    84.72%         430                98    77.21%
Storages/Page/V3/PageDirectory.h                         25                 3    88.00%          25                 3    88.00%         104                10    90.38%           0                 0         -
Storages/Page/V3/PageDirectoryFactory.cpp                50                 3    94.00%           6                 0   100.00%         127                 6    95.28%          50                 4    92.00%
Storages/Page/V3/PageDirectoryFactory.h                   2                 0   100.00%           2                 0   100.00%           8                 0   100.00%           0                 0         -
Storages/Page/V3/PageStorageImpl.cpp                    134                28    79.10%          24                 7    70.83%         293                62    78.84%          72                25    65.28%
Storages/Page/V3/PageStorageImpl.h                        8                 2    75.00%           8                 2    75.00%          22                 2    90.91%           0                 0         -
Storages/Page/V3/WALStore.cpp                            80                 7    91.25%          10                 0   100.00%         154                10    93.51%          34                 8    76.47%
Storages/Page/V3/WALStore.h                              13                 4    69.23%           4                 0   100.00%          17                 3    82.35%          10                 8    20.00%
Storages/Page/V3/tests/entries_helper.h                  68                36    47.06%          10                 3    70.00%         242               112    53.72%          34                22    35.29%
Storages/Page/V3/tests/gtest_page_directory.cpp       10021              1821    81.83%          58                 0   100.00%        1859                 7    99.62%        3166              1603    49.37%
Storages/Page/V3/tests/gtest_page_storage.cpp          3683              1278    65.30%          45                 7    84.44%        1093               154    85.91%        1158               657    43.26%
Storages/Page/V3/tests/gtest_wal_store.cpp             2437               293    87.98%          13                 0   100.00%         546                13    97.62%         814               396    51.35%
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                 17478              3691    78.88%         308                32    89.61%        6401               818    87.22%        6012              2933    51.21%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18253      9784             46.40%    204240  98005        52.01%

full coverage report (for internal network access only)

sre-bot · 2022-05-24T11:04:00Z

Coverage for changed files

Filename                                            Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/FileProvider.cpp                              82                12    85.37%          11                 0   100.00%         144                34    76.39%          62                16    74.19%
Encryption/FileProvider.h                                 2                 0   100.00%           2                 0   100.00%           2                 0   100.00%           0                 0         -
Encryption/MockKeyManager.cpp                            64                 6    90.62%           7                 0   100.00%          81                 9    88.89%          36                11    69.44%
Encryption/MockKeyManager.h                               1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
Storages/DeltaMerge/StoragePool.cpp                     224               108    51.79%          31                 8    74.19%         491               220    55.19%         146                85    41.78%
Storages/Page/PageStorage.h                              19                 1    94.74%          19                 1    94.74%          85                 3    96.47%           0                 0         -
Storages/Page/V3/PageDirectory.cpp                      565                89    84.25%          32                 1    96.88%        1132               173    84.72%         430                98    77.21%
Storages/Page/V3/PageDirectory.h                         25                 3    88.00%          25                 3    88.00%         104                10    90.38%           0                 0         -
Storages/Page/V3/PageDirectoryFactory.cpp                50                 3    94.00%           6                 0   100.00%         127                 6    95.28%          50                 4    92.00%
Storages/Page/V3/PageDirectoryFactory.h                   2                 0   100.00%           2                 0   100.00%           8                 0   100.00%           0                 0         -
Storages/Page/V3/PageStorageImpl.cpp                    134                28    79.10%          24                 7    70.83%         293                62    78.84%          72                25    65.28%
Storages/Page/V3/PageStorageImpl.h                        8                 2    75.00%           8                 2    75.00%          22                 2    90.91%           0                 0         -
Storages/Page/V3/WALStore.cpp                            80                 7    91.25%          10                 0   100.00%         154                10    93.51%          34                 8    76.47%
Storages/Page/V3/WALStore.h                              13                 4    69.23%           4                 0   100.00%          17                 3    82.35%          10                 8    20.00%
Storages/Page/V3/tests/entries_helper.h                  68                36    47.06%          10                 3    70.00%         242               112    53.72%          34                22    35.29%
Storages/Page/V3/tests/gtest_page_directory.cpp       10021              1821    81.83%          58                 0   100.00%        1859                 7    99.62%        3166              1603    49.37%
Storages/Page/V3/tests/gtest_page_storage.cpp          3683              1278    65.30%          45                 7    84.44%        1093               154    85.91%        1158               657    43.26%
Storages/Page/V3/tests/gtest_wal_store.cpp             2437               293    87.98%          13                 0   100.00%         546                13    97.62%         814               396    51.35%
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                 17478              3691    78.88%         308                32    89.61%        6401               818    87.22%        6012              2933    51.21%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18253      9784             46.40%    204240  98008        52.01%

full coverage report (for internal network access only)

flowbehappy · 2022-05-24T11:15:20Z

dbms/src/Storages/Page/PageStorage.h

@@ -140,7 +140,7 @@ class PageStorage : private boost::noncopyable
        SettingUInt64 blob_block_alignment_bytes = 0;

        SettingUInt64 wal_roll_size = PAGE_META_ROLL_SIZE;
-        SettingUInt64 wal_recover_mode = 0;
+        SettingUInt64 wal_recover_mode = 0x00; // WALRecoveryMode::TolerateCorruptedTailRecords


Why not simply

Suggested change

SettingUInt64 wal_recover_mode = 0x00; // WALRecoveryMode::TolerateCorruptedTailRecords

SettingUInt64 wal_recover_mode = WALRecoveryMode::TolerateCorruptedTailRecords;

ti-chi-bot · 2022-05-24T11:18:57Z

@JaySon-Huang: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

JaySon-Huang · 2022-05-24T11:31:15Z

/merge

ti-chi-bot · 2022-05-24T11:31:16Z

@JaySon-Huang: 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.

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 · 2022-05-24T11:31:18Z

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

Commit hash: 377d31c

sre-bot · 2022-05-24T12:01:43Z

Coverage for changed files

Filename                                            Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/FileProvider.cpp                              82                12    85.37%          11                 0   100.00%         144                34    76.39%          62                16    74.19%
Encryption/FileProvider.h                                 2                 0   100.00%           2                 0   100.00%           2                 0   100.00%           0                 0         -
Encryption/MockKeyManager.cpp                            64                 6    90.62%           7                 0   100.00%          81                 9    88.89%          36                11    69.44%
Encryption/MockKeyManager.h                               1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
Storages/DeltaMerge/StoragePool.cpp                     224               108    51.79%          31                 8    74.19%         491               220    55.19%         146                85    41.78%
Storages/Page/PageStorage.h                              19                 1    94.74%          19                 1    94.74%          85                 3    96.47%           0                 0         -
Storages/Page/V3/PageDirectory.cpp                      565                89    84.25%          32                 1    96.88%        1132               173    84.72%         430                98    77.21%
Storages/Page/V3/PageDirectory.h                         25                 3    88.00%          25                 3    88.00%         104                10    90.38%           0                 0         -
Storages/Page/V3/PageDirectoryFactory.cpp                50                 3    94.00%           6                 0   100.00%         127                 6    95.28%          50                 4    92.00%
Storages/Page/V3/PageDirectoryFactory.h                   2                 0   100.00%           2                 0   100.00%           8                 0   100.00%           0                 0         -
Storages/Page/V3/PageStorageImpl.cpp                    134                28    79.10%          24                 7    70.83%         293                62    78.84%          72                25    65.28%
Storages/Page/V3/PageStorageImpl.h                        8                 2    75.00%           8                 2    75.00%          22                 2    90.91%           0                 0         -
Storages/Page/V3/WALStore.cpp                            80                 7    91.25%          10                 0   100.00%         154                10    93.51%          34                 8    76.47%
Storages/Page/V3/WALStore.h                              13                 4    69.23%           4                 0   100.00%          17                 3    82.35%          10                 8    20.00%
Storages/Page/V3/tests/entries_helper.h                  68                36    47.06%          10                 3    70.00%         242               112    53.72%          34                22    35.29%
Storages/Page/V3/tests/gtest_page_directory.cpp       10021              1821    81.83%          58                 0   100.00%        1859                 7    99.62%        3166              1603    49.37%
Storages/Page/V3/tests/gtest_page_storage.cpp          3683              1278    65.30%          45                 7    84.44%        1093               154    85.91%        1158               657    43.26%
Storages/Page/V3/tests/gtest_wal_store.cpp             2437               293    87.98%          13                 0   100.00%         546                13    97.62%         814               396    51.35%
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                 17478              3691    78.88%         308                32    89.61%        6401               818    87.22%        6012              2933    51.21%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18253      9784             46.40%    204242  98007        52.01%

full coverage report (for internal network access only)

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2022-05-24T12:11:25Z

In response to a cherrypick label: new pull request created: #4992.

…id "being_ref_count" (#4987) (#4992) close #4957, close #4986

JaySon-Huang added 4 commits May 24, 2022 14:15

Create another directory instance for dumping log files snapshot

17a1640

Remove encryption info for WAL log file

0dd6845

cleanup useless code

09c067c

Check the recover mode

796e861

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. labels May 24, 2022

JaySon-Huang requested a review from jiaqizho May 24, 2022 07:00

ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 24, 2022

JaySon-Huang requested review from lidezhu and flowbehappy May 24, 2022 07:01

JaySon-Huang and others added 3 commits May 24, 2022 15:13

Update comment

1e3bea5

Use provider->deleteRegularFile

74ccd9a

Merge branch 'master' into fix_concurrent_dump_snapshot

9d99567

JaySon-Huang commented May 24, 2022

View reviewed changes

jiaqizho reviewed May 24, 2022

View reviewed changes

dbms/src/Storages/Page/V3/PageDirectory.cpp Outdated Show resolved Hide resolved

dbms/src/Storages/Page/V3/PageDirectory.cpp Show resolved Hide resolved

dbms/src/Storages/Page/V3/WALStore.cpp Show resolved Hide resolved

JaySon-Huang mentioned this pull request May 24, 2022

PageDirectory: need do gc twice in restore. #4972

Closed

12 tasks

jiaqizho and others added 2 commits May 24, 2022 16:03

PageDirectory: need do gc twice in restore.

8e51c2b

Remove useless code

40f83ad

Signed-off-by: JaySon-Huang <[email protected]>

ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 24, 2022

Address comment

3ec076a

jiaqizho approved these changes May 24, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 24, 2022

lidezhu and others added 4 commits May 24, 2022 16:42

change the relative order of deleting file and deleting encryption info

114054b

Fix FileProvider::deleteRegularFile

e3980a6

Merge branch 'master' into fix_concurrent_dump_snapshot

e02a724

fix

ff79bcf

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

fix ut regression

6bc27c0

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

Merge branch 'master' into fix_concurrent_dump_snapshot

d2db443

flowbehappy reviewed May 24, 2022

View reviewed changes

Merge branch 'master' into fix_concurrent_dump_snapshot

c689dfe

address comment

377d31c

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022

ti-chi-bot merged commit 1412c25 into pingcap:master May 24, 2022

ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request May 24, 2022

This is an automated cherry-pick of pingcap#4987

18cd9c7

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request May 24, 2022

PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" (#4987) #4992

Merged

12 tasks

JaySon-Huang deleted the fix_concurrent_dump_snapshot branch May 24, 2022 12:11

ti-chi-bot added a commit that referenced this pull request May 24, 2022

PageStorage: Fix the WAL snapshot dumped into file may contains inval…

2bcb47a

…id "being_ref_count" (#4987) (#4992) close #4957, close #4986

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" #4987

PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" #4987

JaySon-Huang commented May 24, 2022 •

edited

Loading

ti-chi-bot commented May 24, 2022 •

edited

Loading

JaySon-Huang May 24, 2022

JaySon-Huang commented May 24, 2022

JaySon-Huang commented May 24, 2022

jiaqizho left a comment

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

sre-bot commented May 24, 2022

sre-bot commented May 24, 2022

flowbehappy May 24, 2022

ti-chi-bot commented May 24, 2022

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

sre-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

		const auto log_fullname = filename.fullname(LogFileStage::Normal);
		provider->deleteRegularFile(log_fullname, EncryptionPath(log_fullname, ""));

	SettingUInt64 wal_recover_mode = 0x00; // WALRecoveryMode::TolerateCorruptedTailRecords
	SettingUInt64 wal_recover_mode = WALRecoveryMode::TolerateCorruptedTailRecords;

PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" #4987

PageStorage: Fix the WAL snapshot dumped into file may contains invalid "being_ref_count" #4987

Conversation

JaySon-Huang commented May 24, 2022 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented May 24, 2022 • edited Loading

JaySon-Huang May 24, 2022

Choose a reason for hiding this comment

JaySon-Huang commented May 24, 2022

JaySon-Huang commented May 24, 2022

jiaqizho left a comment

Choose a reason for hiding this comment

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

sre-bot commented May 24, 2022

Coverage for changed files

Coverage summary

sre-bot commented May 24, 2022

Coverage for changed files

Coverage summary

flowbehappy May 24, 2022

Choose a reason for hiding this comment

ti-chi-bot commented May 24, 2022

JaySon-Huang commented May 24, 2022

ti-chi-bot commented May 24, 2022

ti-chi-bot commented May 24, 2022

sre-bot commented May 24, 2022

Coverage for changed files

Coverage summary

ti-chi-bot commented May 24, 2022

JaySon-Huang commented May 24, 2022 •

edited

Loading

ti-chi-bot commented May 24, 2022 •

edited

Loading