[To dev/1.3] [Pipe] Restore sink progress under memory pressure (#18640) - #18649
Merged
Merged
Conversation
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
Backport #18640 to
dev/1.3by cherry-picking e2ac222.Restore sink-batch forward progress
#18582 changed the memory reservation owned by
PipeTabletEventBatchfrom a normalPipeMemoryBlockto aPipeTabletMemoryBlock. This made sink-batch growth subject to the tablet data-structure admission thresholds. Once retained tablet memory crossed that sub-quota, a sink batch could no longer grow enough to transfer and acknowledge events, so the retained/floating memory could not be released either.This change restores the batch reservation to a normal pipe memory block. Tablet and TsFile allocations remain bounded by their data-structure thresholds, while sink batches can use the remaining non-floating memory to make downstream progress and release retained events.
Back off memory-timeout retries
PipeAbstractSinkSubtaskpreviously retriedMEMORY_TIMEOUTfailures immediately while applying backoff to the other transient resource failures. Memory timeouts now use the existing non-report exception backoff after logging the transient condition.The cherry-pick had one conflict in
PipeAbstractSinkSubtask; the resolution preserves thedev/1.3logging code and applies the upstream backoff behavior.Regression coverage
mvn spotless:apply -pl iotdb-core/node-commons,iotdb-core/datanode: passed.mvn test -pl iotdb-core/node-commons -Dtest=PipeSleepIntervalTest: passed (4 tests).git diff origin/dev/1.3..HEAD --check: passed.PipeTransferBatchReqBuilderTestwas attempted, but the standalone DataNode build stopped before tests because the local1.3.7-SNAPSHOTdependency artifacts are older than the currentdev/1.3sources (missing unrelated generated Thrift and cross-module APIs). The changed DataNode source itself produced no compiler error; CI will build it with reactor-consistent dependencies.This PR has:
Key changed/added classes
PipeTabletEventBatchPipeAbstractSinkSubtaskPipeTransferBatchReqBuilderTestPipeSleepIntervalTest