[ZEPPELIN-6256] Fix resource leaks in SparkInterpreterLauncher.detectSparkScalaVersion #5000
+103
−14
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
…SparkScalaVersion
Reamer
requested changes
Jul 25, 2025
There was a problem hiding this comment.
When working on the code here, we should use more modern language features.
It may also be possible to do without a temporary file if you capture the stream from the process.
String processOutput = IOUtils.toString(process.getErrorStream(), StandardCharsets.UTF_8);
| process.waitFor(); | ||
|
|
||
| String processOutput; | ||
| try (FileInputStream in = new FileInputStream(processOutputFile)) { |
There was a problem hiding this comment.
Please use FileUtils.readFileToString(...) instead.
| @@ -272,22 +272,34 @@ private String detectSparkScalaVersion(String sparkHome, Map<String, String> env | |||
| builder.environment().putAll(env); | |||
| File processOutputFile = File.createTempFile("zeppelin-spark", ".out"); | |||
There was a problem hiding this comment.
You can use the following function here.
Files.createTempFile(...)
| return detectSparkScalaVersionByReplClass(sparkHome); | ||
| } | ||
| } finally { | ||
| if (!processOutputFile.delete() && processOutputFile.exists()) { |
There was a problem hiding this comment.
Deletion should be done with this function.
Files.deleteIfExists(...)
https://docs.oracle.com/javase/8/docs/api/java/nio/file/Files.html#deleteIfExists-java.nio.file.Path-
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.
What is this PR for?
This PR fixes resource leaks in the
detectSparkScalaVersionmethod ofSparkInterpreterLauncher.java:These leaks could destabilize Zeppelin over time, especially with frequent interpreter restarts.
What type of PR is it?
Bug Fix
Todos
What is the Jira issue?
How should this be tested?
Unit tests added:
testDetectSparkScalaVersionResourceCleanup: Verifies that FileInputStream is closed and temporary file is deleted after successful executiontestDetectSparkScalaVersionMultipleCalls: Ensures no resource accumulation after multiple method invocationsManual testing:
zeppelin-spark*.outfiles remainCI: All existing tests pass
Screenshots (if appropriate)
N/A
Questions:
Implementation Details
Code Changes
detectSparkScalaVersionmethod to properly manage resources