spark git commit: [SPARK-5653][YARN] In ApplicationMaster rename isDriver to isClusterMode
Repository: spark
Updated Branches:
refs/heads/master 9ad56ad2a -> cc6e53119
[SPARK-5653][YARN] In ApplicationMaster rename isDriver to isClusterMode
in ApplicationMaster rename isDriver to isClusterMode,because in Client it uses
isClusterMode,ApplicationMaster should keep consistent with it and uses
isClusterMode.Also isClusterMode is easier to understand.
andrewor14 sryza
Author: lianhuiwang
Closes #4430 from lianhuiwang/am-isDriver-rename and squashes the following
commits:
f9f3ed0 [lianhuiwang] rename isDriver to isClusterMode
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cc6e5311
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cc6e5311
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cc6e5311
Branch: refs/heads/master
Commit: cc6e53119d7a51b95b19244f50b25814088b4d11
Parents: 9ad56ad
Author: lianhuiwang
Authored: Fri Feb 6 10:48:31 2015 -0800
Committer: Andrew Or
Committed: Fri Feb 6 10:48:31 2015 -0800
--
.../spark/deploy/yarn/ApplicationMaster.scala | 24 ++--
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/cc6e5311/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
--
diff --git
a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 37e98e0..4cc320c 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -54,7 +54,7 @@ private[spark] class ApplicationMaster(
private val sparkConf = new SparkConf()
private val yarnConf: YarnConfiguration =
SparkHadoopUtil.get.newConfiguration(sparkConf)
.asInstanceOf[YarnConfiguration]
- private val isDriver = args.userClass != null
+ private val isClusterMode = args.userClass != null
// Default to numExecutors * 2, with minimum of 3
private val maxNumExecutorFailures =
sparkConf.getInt("spark.yarn.max.executor.failures",
@@ -81,7 +81,7 @@ private[spark] class ApplicationMaster(
try {
val appAttemptId = client.getAttemptId()
- if (isDriver) {
+ if (isClusterMode) {
// Set the web ui port to be ephemeral for yarn so we don't conflict
with
// other spark processes running on the same box
System.setProperty("spark.ui.port", "0")
@@ -139,7 +139,7 @@ private[spark] class ApplicationMaster(
// doAs in order for the credentials to be passed on to the executor
containers.
val securityMgr = new SecurityManager(sparkConf)
- if (isDriver) {
+ if (isClusterMode) {
runDriver(securityMgr)
} else {
runExecutorLauncher(securityMgr)
@@ -162,7 +162,7 @@ private[spark] class ApplicationMaster(
* from the application code.
*/
final def getDefaultFinalStatus() = {
-if (isDriver) {
+if (isClusterMode) {
FinalApplicationStatus.SUCCEEDED
} else {
FinalApplicationStatus.UNDEFINED
@@ -243,7 +243,7 @@ private[spark] class ApplicationMaster(
private def runAMActor(
host: String,
port: String,
- isDriver: Boolean): Unit = {
+ isClusterMode: Boolean): Unit = {
val driverUrl = AkkaUtils.address(
AkkaUtils.protocol(actorSystem),
@@ -251,7 +251,7 @@ private[spark] class ApplicationMaster(
host,
port,
YarnSchedulerBackend.ACTOR_NAME)
-actor = actorSystem.actorOf(Props(new AMActor(driverUrl, isDriver)), name
= "YarnAM")
+actor = actorSystem.actorOf(Props(new AMActor(driverUrl, isClusterMode)),
name = "YarnAM")
}
private def runDriver(securityMgr: SecurityManager): Unit = {
@@ -272,7 +272,7 @@ private[spark] class ApplicationMaster(
runAMActor(
sc.getConf.get("spark.driver.host"),
sc.getConf.get("spark.driver.port"),
-isDriver = true)
+isClusterMode = true)
registerAM(sc.ui.map(_.appUIAddress).getOrElse(""), securityMgr)
userClassThread.join()
}
@@ -427,7 +427,7 @@ private[spark] class ApplicationMaster(
sparkConf.set("spark.driver.host", driverHost)
sparkConf.set("spark.driver.port", driverPort.toString)
-runAMActor(driverHost, driverPort.toString, isDriver = false)
+runAMActor(driverHost, driverPort.toString, isClusterMode = false)
}
/** Add the Yarn IP filter that is required for properly securing the UI. */
@@ -435,7 +435,7 @@ private[spark] class ApplicationMaster(
val proxyBase =
System.getenv(ApplicationConstants.APPLICATION_WEB_PROXY_BASE_ENV)
val amFilter = "org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpFilter"
val params = client
spark git commit: [SPARK-5653][YARN] In ApplicationMaster rename isDriver to isClusterMode
Repository: spark
Updated Branches:
refs/heads/branch-1.3 faccdcbc2 -> 4ff8855e8
[SPARK-5653][YARN] In ApplicationMaster rename isDriver to isClusterMode
in ApplicationMaster rename isDriver to isClusterMode,because in Client it uses
isClusterMode,ApplicationMaster should keep consistent with it and uses
isClusterMode.Also isClusterMode is easier to understand.
andrewor14 sryza
Author: lianhuiwang
Closes #4430 from lianhuiwang/am-isDriver-rename and squashes the following
commits:
f9f3ed0 [lianhuiwang] rename isDriver to isClusterMode
(cherry picked from commit cc6e53119d7a51b95b19244f50b25814088b4d11)
Signed-off-by: Andrew Or
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4ff8855e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4ff8855e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4ff8855e
Branch: refs/heads/branch-1.3
Commit: 4ff8855e8e4c53e4979670035287c54a7fb61597
Parents: faccdcb
Author: lianhuiwang
Authored: Fri Feb 6 10:48:31 2015 -0800
Committer: Andrew Or
Committed: Fri Feb 6 10:48:41 2015 -0800
--
.../spark/deploy/yarn/ApplicationMaster.scala | 24 ++--
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/4ff8855e/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
--
diff --git
a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 37e98e0..4cc320c 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -54,7 +54,7 @@ private[spark] class ApplicationMaster(
private val sparkConf = new SparkConf()
private val yarnConf: YarnConfiguration =
SparkHadoopUtil.get.newConfiguration(sparkConf)
.asInstanceOf[YarnConfiguration]
- private val isDriver = args.userClass != null
+ private val isClusterMode = args.userClass != null
// Default to numExecutors * 2, with minimum of 3
private val maxNumExecutorFailures =
sparkConf.getInt("spark.yarn.max.executor.failures",
@@ -81,7 +81,7 @@ private[spark] class ApplicationMaster(
try {
val appAttemptId = client.getAttemptId()
- if (isDriver) {
+ if (isClusterMode) {
// Set the web ui port to be ephemeral for yarn so we don't conflict
with
// other spark processes running on the same box
System.setProperty("spark.ui.port", "0")
@@ -139,7 +139,7 @@ private[spark] class ApplicationMaster(
// doAs in order for the credentials to be passed on to the executor
containers.
val securityMgr = new SecurityManager(sparkConf)
- if (isDriver) {
+ if (isClusterMode) {
runDriver(securityMgr)
} else {
runExecutorLauncher(securityMgr)
@@ -162,7 +162,7 @@ private[spark] class ApplicationMaster(
* from the application code.
*/
final def getDefaultFinalStatus() = {
-if (isDriver) {
+if (isClusterMode) {
FinalApplicationStatus.SUCCEEDED
} else {
FinalApplicationStatus.UNDEFINED
@@ -243,7 +243,7 @@ private[spark] class ApplicationMaster(
private def runAMActor(
host: String,
port: String,
- isDriver: Boolean): Unit = {
+ isClusterMode: Boolean): Unit = {
val driverUrl = AkkaUtils.address(
AkkaUtils.protocol(actorSystem),
@@ -251,7 +251,7 @@ private[spark] class ApplicationMaster(
host,
port,
YarnSchedulerBackend.ACTOR_NAME)
-actor = actorSystem.actorOf(Props(new AMActor(driverUrl, isDriver)), name
= "YarnAM")
+actor = actorSystem.actorOf(Props(new AMActor(driverUrl, isClusterMode)),
name = "YarnAM")
}
private def runDriver(securityMgr: SecurityManager): Unit = {
@@ -272,7 +272,7 @@ private[spark] class ApplicationMaster(
runAMActor(
sc.getConf.get("spark.driver.host"),
sc.getConf.get("spark.driver.port"),
-isDriver = true)
+isClusterMode = true)
registerAM(sc.ui.map(_.appUIAddress).getOrElse(""), securityMgr)
userClassThread.join()
}
@@ -427,7 +427,7 @@ private[spark] class ApplicationMaster(
sparkConf.set("spark.driver.host", driverHost)
sparkConf.set("spark.driver.port", driverPort.toString)
-runAMActor(driverHost, driverPort.toString, isDriver = false)
+runAMActor(driverHost, driverPort.toString, isClusterMode = false)
}
/** Add the Yarn IP filter that is required for properly securing the UI. */
@@ -435,7 +435,7 @@ private[spark] class ApplicationMaster(
val proxyBase =
System.getenv(ApplicationConstants.APPLICATION_WEB_PROXY_BASE_ENV)
