Pipe: Fix TsFile reference races and improve result set diffs - #18376
Open
Caideyipi wants to merge 4 commits into
Open
Pipe: Fix TsFile reference races and improve result set diffs#18376Caideyipi wants to merge 4 commits into
Caideyipi wants to merge 4 commits into
Conversation
Caideyipi
force-pushed
the
fix/pipe-tsfile-reference-race
branch
from
August 5, 2026 07:42
ea2ab0e to
25057ef
Compare
jt2594838
reviewed
Aug 24, 2026
Comment on lines
-133
to
+129
| if (Objects.nonNull(pipeName)) { | ||
| pipeNameToPipeTsFileDirPathMap.putIfAbsent( | ||
| pipeName, hardlinkOrCopiedFile.getParentFile().getPath()); | ||
| hardlinkOrCopiedFileToPipeTsFileResourceMap | ||
| .computeIfAbsent(pipeName, k -> new ConcurrentHashMap<>()) | ||
| .put(resultFile.getPath(), new PipeTsFileResource(resultFile)); | ||
| final PipeTsFileResource existingResource = | ||
| getResourceMap(pipeName).get(hardlinkOrCopiedFile.getPath()); | ||
| if (existingResource != null) { | ||
| existingResource.increaseReferenceCount(); | ||
| resultFile = existingResource.getFile(); |
Contributor
There was a problem hiding this comment.
The nullability of pipeName is not checked before calling getResourceMap(pipeName). Is that ok?
Collaborator
Author
There was a problem hiding this comment.
Yes. getResourceMap accepts a nullable pipeName: a non-null name selects the per-pipe private map, while null deliberately selects hardlinkOrCopiedFileToTsFilePublicResourceMap. The null path is used for the shared public reference owned by the assigner. I added Javadoc in ed65e27 to make this contract explicit.
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.
Description
PipeTsFileResourceManager.increaseFileReferencechecked whether a resource existed before entering the creation critical section. Historical and realtime extractors could both observe a missing resource, then create and put separatePipeTsFileResourceinstances for the same pipe file. The later put overwrote the first reference count, so releasing one event could delete a file that another event still needed. In the reported table pattern IT, this stopped realtime transfer and left thet0row missing.This PR:
.mods/.resource;Set<String>assertions print concise missing and unexpected rows instead of two complete, highly repetitive sets (up to 20 rows per side).The concurrent regression tests start 64 retain operations together and verify that both private and shared reference counts reach 64, then verify complete cleanup after all releases. A separate failure-path test verifies that a failed public reference increase leaves neither a private count nor a copied file behind.
Validation
mvn -pl iotdb-core/datanode -Dtest=PipeTsFileResourceManagerTest test(5 tests passed)mvn -pl integration-test -P with-integration-tests -DskipTests test-compilegit diff --checkThis PR has:
Key changed/added classes
PipeTsFileResourceManagerPipeTsFileResourceManagerTestTestUtils