SPARK_HOME detection supports Spark 4 #6413
Closed
Conversation
This file contains 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
pan3793
commented
May 23, 2024
| @@ -403,36 +403,43 @@ class SparkProcessBuilderSuite extends KerberizedTestHelper with MockitoSugar { | |||
| "spark-core_2.13-3.5.0-abc-20230921.jar", | |||
| "spark-core_2.13-3.5.0-xyz-1.2.3.jar", | |||
| "spark-core_2.13-3.5.0.1.jar", | |||
| "spark-core_2.13.2-3.5.0.jar").foreach { f => | |||
There was a problem hiding this comment.
this actually is a negative case.
pan3793
commented
May 23, 2024
| """^spark-3\.\d+\.\d+-bin-hadoop\d(\.\d+)?+-scala2\.13$""".r | ||
|
|
||
| final private[kyuubi] val SPARK4_HOME_REGEX_SCALA_213 = | ||
| """^spark-4\.\d+\.\d+(-\w*)?-bin-hadoop\d(\.\d+)?+$""".r |
There was a problem hiding this comment.
SPARK_HOME detection should be conservative since it is only used for testing purposes, and users/developers can always set SPARK_HOME explicitly to override it. While SPARK_CORE_SCALA_VERSION_REGEX is used to detect the Scala version, it should consider vender-provided Spark distributions too.
3 tasks
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6413 +/- ##
============================================
+ Coverage 58.32% 58.34% +0.01%
Complexity 24 24
============================================
Files 656 656
Lines 40263 40265 +2
Branches 5499 5498 -1
============================================
+ Hits 23482 23491 +9
+ Misses 14276 14269 -7
Partials 2505 2505 ☔ View full report in Codecov by Sentry. |
cxzl25
approved these changes
May 23, 2024
|
Thanks, merged to master/1.9 |
pan3793
added a commit
that referenced
this pull request
May 23, 2024
# Description When `SPARK_HOME` is not set explicitly, the Kyuubi server supports detecting it based on Scala versions, while the rules are not applicable for Spark 4. This PR enhances the SPARK_HOME detection logic to make it support both Spark 3 and Spark 4. The above logic is mainly used for testing purposes, the change does not affect users who configure `SPARK_HOME` in `kyuubi-env.sh`. ## Types of changes - [ ] Bugfix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan #### Related Unit Tests - `SparkProcessBuilderSuite` --- # Checklist 📝 - [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes #6413 from pan3793/spark4-home. Closes #6413 20e71fd [Cheng Pan] SPARK_HOME detection supports Spark 4 Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org> (cherry picked from commit b89c185) Signed-off-by: Cheng Pan <chengpan@apache.org>
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
When
SPARK_HOMEis not set explicitly, the Kyuubi server supports detecting it based on Scala versions, while the rules are not applicable for Spark 4.This PR enhances the SPARK_HOME detection logic to make it support both Spark 3 and Spark 4.
The above logic is mainly used for testing purposes, the change does not affect users who configure
SPARK_HOMEinkyuubi-env.sh.Types of changes
Test Plan
Related Unit Tests
SparkProcessBuilderSuiteChecklist 📝
Be nice. Be informative.