[KYUUBI #7290] Prevent engine session leak after Kyuubi session closed #7294
+17
−1
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
…uubi session has been closed
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7294 +/- ##
======================================
Coverage 0.00% 0.00%
======================================
Files 698 698
Lines 43636 43646 +10
Branches 5893 5894 +1
======================================
- Misses 43636 43646 +10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
pan3793
reviewed
Dec 31, 2025
kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala
Show resolved
Hide resolved
Member
|
the idea makes sense to me |
ruanwenjun
changed the title
ruanwenjun
force-pushed
the
dev_wenjun_fix7290
branch
from
866126d to
f3e9098
Compare
There was a problem hiding this comment.
Pull request overview
This PR addresses a resource leak issue where an engine session could remain active after the Kyuubi session was closed, specifically when the Kyuubi session is closed during the engine session initialization process.
Key Changes:
- Added
isClosedmethod to the Session trait to track session closure state - Implemented the isClosed check in AbstractSession using a volatile boolean flag
- Added a check in KyuubiSessionImpl after engine session initialization to detect if the Kyuubi session was closed during initialization and throw an exception to trigger cleanup
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| kyuubi-common/src/main/scala/org/apache/kyuubi/session/Session.scala | Added isClosed method signature to the Session trait |
| kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala | Implemented isClosed method with a @volatile boolean flag and added idempotent close logic |
| kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala | Added isClosed check after engine session opening to prevent resource leak when Kyuubi session is closed during engine initialization |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
Outdated
Show resolved
Hide resolved
| if (isClosed) { | ||
| throw KyuubiSQLException(s"KyuubiSession $handle has been closed") | ||
| } |
There was a problem hiding this comment.
This critical race condition fix lacks automated test coverage. Consider adding a test that simulates closing a Kyuubi session while the engine session is being initialized to verify that the engine session is properly cleaned up. This could be done by using a mock or by introducing a delay in the engine session opening process during the test.
ruanwenjun
force-pushed
the
dev_wenjun_fix7290
branch
from
f3e9098 to
d3c8608
Compare
pan3793
reviewed
Jan 4, 2026
kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
Show resolved
Hide resolved
pan3793
reviewed
Jan 4, 2026
kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
Outdated
Show resolved
Hide resolved
pan3793
approved these changes
Jan 4, 2026
Member
Author
|
Hi @pan3793, please help re-run the timeout test case. Thanks! |
turboFei
approved these changes
Jan 5, 2026
pan3793
pushed a commit
that referenced
this pull request
Jan 5, 2026
### Why are the changes needed? close #7290 When we close a kyuubi session, if the engine session(thrift client) has not initialized, then the kyuubi session will be closed, but the engine session might be alive, then will result in a resource leak. ### How was this patch tested? Can be tested by when the engine pod is pending, and then kill the jdbc client, the driver pod should be killed after initialized. ### Was this patch authored or co-authored using generative AI tooling? NO Closes #7294 from ruanwenjun/dev_wenjun_fix7290. Closes #7290 142a210 [ruanwenjun] make sure the client closed 9745206 [ruanwenjun] set shouldRetry to false d3c8608 [ruanwenjun] remove unused comment 866126d [ruanwenjun] If the session already closed, then return 3b2ee39 [ruanwenjun] [KYUUBI #7290] Fix the engine session might still alive when kyuubi session has been closed Authored-by: ruanwenjun <[email protected]> Signed-off-by: Cheng Pan <[email protected]> (cherry picked from commit 8bed9de) Signed-off-by: Cheng Pan <[email protected]>
pan3793
pushed a commit
that referenced
this pull request
Jan 5, 2026
### Why are the changes needed? close #7290 When we close a kyuubi session, if the engine session(thrift client) has not initialized, then the kyuubi session will be closed, but the engine session might be alive, then will result in a resource leak. ### How was this patch tested? Can be tested by when the engine pod is pending, and then kill the jdbc client, the driver pod should be killed after initialized. ### Was this patch authored or co-authored using generative AI tooling? NO Closes #7294 from ruanwenjun/dev_wenjun_fix7290. Closes #7290 142a210 [ruanwenjun] make sure the client closed 9745206 [ruanwenjun] set shouldRetry to false d3c8608 [ruanwenjun] remove unused comment 866126d [ruanwenjun] If the session already closed, then return 3b2ee39 [ruanwenjun] [KYUUBI #7290] Fix the engine session might still alive when kyuubi session has been closed Authored-by: ruanwenjun <[email protected]> Signed-off-by: Cheng Pan <[email protected]> (cherry picked from commit 8bed9de) Signed-off-by: Cheng Pan <[email protected]>
Member
|
thanks, merged to master/1.11.1/1.10.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Why are the changes needed?
close #7290
When we close a kyuubi session, if the engine session(thrift client) has not initialized, then the kyuubi session will be closed, but the engine session might be alive, then will result in a resource leak.
How was this patch tested?
Can be tested by when the engine pod is pending, and then kill the jdbc client, the driver pod should be killed after initialized, but not.
Was this patch authored or co-authored using generative AI tooling?
NO