You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2019/03/23 19:20:14 UTC
[spark] branch branch-2.4 updated: Revert "[SPARK-26606][CORE]
Handle driver options properly when submitting to standalone cluster mode
via legacy Client"
This is an automated email from the ASF dual-hosted git repository.
vanzin pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 3fc626d Revert "[SPARK-26606][CORE] Handle driver options properly when submitting to standalone cluster mode via legacy Client"
3fc626d is described below
commit 3fc626d874d0201ada8387a7e5806672c79cd6b3
Author: Marcelo Vanzin <va...@cloudera.com>
AuthorDate: Sat Mar 23 12:18:08 2019 -0700
Revert "[SPARK-26606][CORE] Handle driver options properly when submitting to standalone cluster mode via legacy Client"
This reverts commit 6f1a8d8bfdd8dccc9af2d144ea5ad644ddc63a81.
---
core/src/main/scala/org/apache/spark/deploy/Client.scala | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/deploy/Client.scala b/core/src/main/scala/org/apache/spark/deploy/Client.scala
index 708910b..d514509 100644
--- a/core/src/main/scala/org/apache/spark/deploy/Client.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/Client.scala
@@ -60,10 +60,6 @@ private class ClientEndpoint(
private val lostMasters = new HashSet[RpcAddress]
private var activeMasterEndpoint: RpcEndpointRef = null
- private def getProperty(key: String, conf: SparkConf): Option[String] = {
- sys.props.get(key).orElse(conf.getOption(key))
- }
-
override def onStart(): Unit = {
driverArgs.cmd match {
case "launch" =>
@@ -73,19 +69,18 @@ private class ClientEndpoint(
val mainClass = "org.apache.spark.deploy.worker.DriverWrapper"
val classPathConf = "spark.driver.extraClassPath"
- val classPathEntries = getProperty(classPathConf, conf).toSeq.flatMap { cp =>
+ val classPathEntries = sys.props.get(classPathConf).toSeq.flatMap { cp =>
cp.split(java.io.File.pathSeparator)
}
val libraryPathConf = "spark.driver.extraLibraryPath"
- val libraryPathEntries = getProperty(libraryPathConf, conf).toSeq.flatMap { cp =>
+ val libraryPathEntries = sys.props.get(libraryPathConf).toSeq.flatMap { cp =>
cp.split(java.io.File.pathSeparator)
}
val extraJavaOptsConf = "spark.driver.extraJavaOptions"
- val extraJavaOpts = getProperty(extraJavaOptsConf, conf)
+ val extraJavaOpts = sys.props.get(extraJavaOptsConf)
.map(Utils.splitCommandString).getOrElse(Seq.empty)
-
val sparkJavaOpts = Utils.sparkJavaOpts(conf)
val javaOpts = sparkJavaOpts ++ extraJavaOpts
val command = new Command(mainClass,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org