diff options
author | jerryshao <sshao@hortonworks.com> | 2016-02-23 12:30:57 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2016-02-23 12:30:57 +0000 |
commit | e99d0170982b06676110906db4de6196586829f6 (patch) | |
tree | bcd00ef6354908f8b02aa99b1eaeae5252e7a026 /yarn/src/test/scala/org | |
parent | 87250580f214cb7c4dff01c5a3498ea6cb79a27e (diff) | |
download | spark-e99d0170982b06676110906db4de6196586829f6.tar.gz spark-e99d0170982b06676110906db4de6196586829f6.tar.bz2 spark-e99d0170982b06676110906db4de6196586829f6.zip |
[SPARK-13220][CORE] deprecate yarn-client and yarn-cluster mode
Author: jerryshao <sshao@hortonworks.com>
Closes #11229 from jerryshao/SPARK-13220.
Diffstat (limited to 'yarn/src/test/scala/org')
-rw-r--r-- | yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala | 5 | ||||
-rw-r--r-- | yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala b/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala index cd24c704ec..272e2454da 100644 --- a/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala +++ b/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala @@ -136,7 +136,7 @@ abstract class BaseYarnClusterSuite extraJars: Seq[String] = Nil, extraConf: Map[String, String] = Map(), extraEnv: Map[String, String] = Map()): SparkAppHandle.State = { - val master = if (clientMode) "yarn-client" else "yarn-cluster" + val deployMode = if (clientMode) "client" else "cluster" val propsFile = createConfFile(extraClassPath = extraClassPath, extraConf = extraConf) val env = Map("YARN_CONF_DIR" -> hadoopConfDir.getAbsolutePath()) ++ extraEnv @@ -148,7 +148,8 @@ abstract class BaseYarnClusterSuite launcher.setAppResource(fakeSparkJar.getAbsolutePath()) } launcher.setSparkHome(sys.props("spark.test.home")) - .setMaster(master) + .setMaster("yarn") + .setDeployMode(deployMode) .setConf("spark.executor.instances", "1") .setPropertiesFile(propsFile) .addAppArgs(appArgs.toArray: _*) diff --git a/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala b/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala index b91c4be2ea..60d35d3452 100644 --- a/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala +++ b/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala @@ -115,7 +115,8 @@ class YarnClusterSuite extends BaseYarnClusterSuite { .setSparkHome(sys.props("spark.test.home")) .setConf("spark.ui.enabled", "false") .setPropertiesFile(propsFile) - .setMaster("yarn-client") + .setMaster("yarn") + .setDeployMode("client") .setAppResource("spark-internal") .setMainClass(mainClassName(YarnLauncherTestApp.getClass)) .startApplication() |