Repository navigation
[To dev/1.3] Fix tree deletion recovery during WAL replay (#19081) - #19089
Merged
Merged
Conversation
Backport the tree-model WAL deletion recovery fix from 76d573a. The table-model changes from the source commit are not included because dev/1.3 has no corresponding table-model implementation.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Backport the tree-model WAL deletion recovery fix from #19081, source commit
76d573a4e3d83068d4eb4bbb1e4ed97040463eb8, ontodev/1.3ateda8986d15926bf7669e7b51de73405ec65bf7ea.Replay the original deletion against the recovered memtable. Persist file mods only for matching devices and cap each mod at that device's flushed end time, preserving measurement scope and wildcard matching so later WAL rewrites remain visible after restart.
Compatibility adaptations
DeletionandTsFileResource.getModFile()APIs, retain file offsets, and match device paths with the target tree-path APIs.PlainDeviceIDand explicit chunk-reader cleanup for TsFile 1.x test compatibility.IoTDBDeletionRecoveryITwith theLocalStandaloneITcategory because the target branch'sIoTDBRestartITis ignored.Only the requested tree-model portion is included. The source table-model changes have no corresponding implementation on
dev/1.3.Validation
Local validation with JDK 17 and Maven 3.8.8:
TsFilePlanRedoerTest: 10 tests passed, 0 failures/errors/skips.IoTDBDeletionRecoveryITwithwith-integration-tests,SimpleIT: 1 test passed, 0 failures/errors/skips. The test covers deletion, a later rewrite, forced DataNode restart, and a subsequent flush.