Fix SPARK-1609: Executor fails to start when Command.extraJavaOptions contains multiple Java options #547
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
|
Can one of the admins verify this patch? |
| val extraOpts = command.extraJavaOptions.toSeq | ||
| val extraOpts = command.extraJavaOptions match { | ||
| case Some(opts) => | ||
| opts.split("\\s+").toSeq |
There was a problem hiding this comment.
Use Utils.splitCommandString instead of this, in case people pass in stuff with quotes.
| @@ -48,7 +48,13 @@ object CommandUtils extends Logging { | |||
| def buildJavaOpts(command: Command, memory: Int, sparkHome: String): Seq[String] = { | |||
| val memoryOpts = Seq(s"-Xms${memory}M", s"-Xmx${memory}M") | |||
| // Note, this will coalesce multiple options into a single command component | |||
| val extraOpts = command.extraJavaOptions.toSeq | |||
| val extraOpts = command.extraJavaOptions match { | |||
There was a problem hiding this comment.
Up to you, but could be written a bit more consicely
val extraOpts = command.extraJavaOptions.map(Utils.splitCommandString).getOrElse(Seq())
There was a problem hiding this comment.
Yes, val extraOpts = command.extraJavaOptions.map(Utils.splitCommandString).getOrElse(Seq()) is better
|
Jenkins, test this please. |
|
Merged build triggered. |
|
Merged build started. |
|
Merged build finished. All automated tests passed. |
|
All automated tests passed. |
|
Thanks for the fix! I've merged this |
asfgit
pushed a commit
that referenced
this pull request
Apr 28, 2014
… contains multiple Java options Author: witgo <witgo@qq.com> Closes #547 from witgo/SPARK-1609 and squashes the following commits: deb6a4c [witgo] review commit 91da0bb [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 0640852 [witgo] review commit 8f90b22 [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 bcf36cb [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 1185605 [witgo] fix extraJavaOptions split f7c0ab7 [witgo] bugfix 86fc4bb [witgo] bugfix 8a265b7 [witgo] Fix SPARK-1609: Executor fails to start when use spark-submit
pdeyhim
pushed a commit
to pdeyhim/spark-1
that referenced
this pull request
Jun 25, 2014
… contains multiple Java options Author: witgo <witgo@qq.com> Closes apache#547 from witgo/SPARK-1609 and squashes the following commits: deb6a4c [witgo] review commit 91da0bb [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 0640852 [witgo] review commit 8f90b22 [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 bcf36cb [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1609 1185605 [witgo] fix extraJavaOptions split f7c0ab7 [witgo] bugfix 86fc4bb [witgo] bugfix 8a265b7 [witgo] Fix SPARK-1609: Executor fails to start when use spark-submit
helenyugithub
pushed a commit
to helenyugithub/spark
that referenced
this pull request
Aug 20, 2019
Upgrade hadoop to new version.
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.
No description provided.