Github user mccheah commented on a diff in the pull request:
https://github.com/apache/spark/pull/4106#discussion_r25313853
--- Diff:
core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
---
@@ -125,39 +125,39 @@ private[spark] object CoarseGrainedExecutorBackend
extends Logging {
SignalLogger.register(log)
- SparkHadoopUtil.get.runAsSparkUser { () =>
- // Debug code
- Utils.checkHost(hostname)
-
- // Bootstrap to fetch the driver's Spark properties.
- val executorConf = new SparkConf
- val port = executorConf.getInt("spark.executor.port", 0)
- val (fetcher, _) = AkkaUtils.createActorSystem(
- "driverPropsFetcher",
- hostname,
- port,
- executorConf,
- new SecurityManager(executorConf))
- val driver = fetcher.actorSelection(driverUrl)
- val timeout = AkkaUtils.askTimeout(executorConf)
- val fut = Patterns.ask(driver, RetrieveSparkProps, timeout)
- val props = Await.result(fut, timeout).asInstanceOf[Seq[(String,
String)]] ++
- Seq[(String, String)](("spark.app.id", appId))
- fetcher.shutdown()
-
- // Create SparkEnv using properties we fetched from the driver.
- val driverConf = new SparkConf()
- for ((key, value) <- props) {
- // this is required for SSL in standalone mode
- if (SparkConf.isExecutorStartupConf(key)) {
- driverConf.setIfMissing(key, value)
- } else {
- driverConf.set(key, value)
- }
+ // Debug code
+ Utils.checkHost(hostname)
+
+ // Bootstrap to fetch the driver's Spark properties.
+ val executorConf = new SparkConf
+ val port = executorConf.getInt("spark.executor.port", 0)
+ val (fetcher, _) = AkkaUtils.createActorSystem(
+ "driverPropsFetcher",
+ hostname,
+ port,
+ executorConf,
+ new SecurityManager(executorConf))
+ val driver = fetcher.actorSelection(driverUrl)
+ val timeout = AkkaUtils.askTimeout(executorConf)
+ val fut = Patterns.ask(driver, RetrieveSparkProps, timeout)
+ val props = Await.result(fut, timeout).asInstanceOf[Seq[(String,
String)]] ++
+ Seq[(String, String)](("spark.app.id", appId))
+ fetcher.shutdown()
+
+ // Create SparkEnv using properties we fetched from the driver.
+ val driverConf = new SparkConf()
+ for ((key, value) <- props) {
+ // this is required for SSL in standalone mode
+ if (SparkConf.isExecutorStartupConf(key)) {
+ driverConf.setIfMissing(key, value)
+ } else {
+ driverConf.set(key, value)
}
--- End diff --
Please double check my merge here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]