Core: close entries iterable in ManifestFilterManager#15713
Open
kinolaev wants to merge 2 commits intoapache:mainfrom
Open
Core: close entries iterable in ManifestFilterManager#15713kinolaev wants to merge 2 commits intoapache:mainfrom
kinolaev wants to merge 2 commits intoapache:mainfrom
Conversation
d7d1bd6 to
fa8978c
Compare
3 tasks
anoopj
reviewed
Mar 25, 2026
Comment on lines
514
to
516
Contributor
There was a problem hiding this comment.
This has the same problem. Perhaps fix this as well?
Author
There was a problem hiding this comment.
filterManifestWithDeletedFiles is called only in filterManifest, where reader is already wrapped with try-with-resources. So it doesn't cause any issue. But if you'd like I can wrap this liveEntries() call too, just in case.
Author
There was a problem hiding this comment.
Fixed, just in case, looks a little safer now)
Signed-off-by: Sergei Nikolaev <kinolaev@gmail.com>
fa8978c to
845e15d
Compare
anoopj
approved these changes
Mar 25, 2026
Contributor
anoopj
left a comment
There was a problem hiding this comment.
The change looks good to me.
Optional: it would be nice to have a test that can repro this.
Signed-off-by: Sergei Nikolaev <kinolaev@gmail.com>
Author
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.
This PR prevents deadlocks while filtering manifest entries. The problem is
ManifestFilterManager.filterManifestin some cases reads each manifest twice: first inmanifestHasDeletedFilesand then infilterManifestWithDeletedFiles. IfmanifestHasDeletedFilesreturns in the middle of entries iterable, the underlying connection is open until the ManifestReader is closed.filterManifestmethod is called for all manifests in parallel. When number of simultaneous connections is limited (for example by http-client.apache.max-connections) it can lead to a deadlock because all connections are held bymanifestHasDeletedFiles.The problem can be reproduced using spark-sql with S3FileIO and
http-client.apache.max-connections=1: