[SPARK-51146][SQL][FOLLOWUP] Respect system env SPARK_CONNECT_MODE in places that access the api mode config
#49930
+15
−9
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
|
cc @HyukjinKwon |
HyukjinKwon
approved these changes
Feb 13, 2025
dongjoon-hyun
approved these changes
Feb 13, 2025
|
BTW, I'm wondering if we are going to fix the broken |
|
@dongjoon-hyun I'd like the cut rc1 on time to kick off the release cycle. We can fail rc1 if there are many pending work, which will likely happen. |
cloud-fan
force-pushed
the
release
branch
2 times, most recently
from
92cfb59 to
012052f
Compare
|
Ya, I agree with you, @cloud-fan .
|
cloud-fan
commented
Feb 14, 2025
cloud-fan
commented
Feb 14, 2025
launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
Outdated
Show resolved
Hide resolved
…mmandBuilder.java
cloud-fan
commented
Feb 14, 2025
launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
Outdated
Show resolved
Hide resolved
…mmandBuilder.java
cloud-fan
commented
Feb 15, 2025
launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
Outdated
Show resolved
Hide resolved
…mmandBuilder.java
cloud-fan
commented
Feb 15, 2025
|
All tests passed except for python code style check, and the last commit just reformats the code. I'm merging it to master/4.0, thanks for the review! |
cloud-fan
added a commit
that referenced
this pull request
Feb 15, 2025
…in places that access the api mode config ### What changes were proposed in this pull request? This is a followup of the additional Spark Connect distribution work. Some places that access the api mode config do not use the config framework and do not respect the defined default value. We need to update them manually to get the default value properly by looking at the special system env `SPARK_CONNECT_MODE` set in scripts of the spark connect distribution. ### Why are the changes needed? to make the additional Spark Connect distribution work as expected. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? manually tested locally. The expectation is: 1. if `--remote` is specified, then we pick connect mode no matter what the api mode config is 2. if `--master` is specified, then we pick classic or connect mode depending on the api mode config. If the config is not specified, the default value varies between the default distribution and the Spark connect distribution. 3. if neither `--remote` nor `--master` is specified, it's equal to `--master local[*]`, and then it's the same as rule 2. ### Was this patch authored or co-authored using generative AI tooling? no Closes #49930 from cloud-fan/release. Lead-authored-by: Wenchen Fan <[email protected]> Co-authored-by: Wenchen Fan <[email protected]> Signed-off-by: Wenchen Fan <[email protected]> (cherry picked from commit f601eb7) Signed-off-by: Wenchen Fan <[email protected]>
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 changes were proposed in this pull request?
This is a followup of the additional Spark Connect distribution work. Some places that access the api mode config do not use the config framework and do not respect the defined default value. We need to update them manually to get the default value properly by looking at the special system env
SPARK_CONNECT_MODEset in scripts of the spark connect distribution.Why are the changes needed?
to make the additional Spark Connect distribution work as expected.
Does this PR introduce any user-facing change?
no
How was this patch tested?
manually tested locally. The expectation is:
--remoteis specified, then we pick connect mode no matter what the api mode config is--masteris specified, then we pick classic or connect mode depending on the api mode config. If the config is not specified, the default value varies between the default distribution and the Spark connect distribution.--remotenor--masteris specified, it's equal to--master local[*], and then it's the same as rule 2.Was this patch authored or co-authored using generative AI tooling?
no