From 978abe8af8fa84ed5bc90cacda33b5b65c3a987c Mon Sep 17 00:00:00 2001 From: haiy Date: Wed, 13 May 2015 21:22:29 +0800 Subject: [PATCH 1/2] Change spark.yarn.app.id to spark.app.id So that we can use the method getAppId in SparkConf intuitively. --- .../scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 29752969e6152..28879328aa8c2 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 @@ -90,7 +90,7 @@ private[spark] class ApplicationMaster( System.setProperty("spark.master", "yarn-cluster") // Propagate the application ID so that YarnClusterSchedulerBackend can pick it up. - System.setProperty("spark.yarn.app.id", appAttemptId.getApplicationId().toString()) + System.setProperty("spark.app.id", appAttemptId.getApplicationId().toString()) // Propagate the attempt if, so that in case of event logging, // different attempt's logs gets created in different directory From 26b8f29ffc5a2be488df41552eb4b00c35b5ad21 Mon Sep 17 00:00:00 2001 From: haiy Date: Wed, 13 May 2015 21:26:41 +0800 Subject: [PATCH 2/2] Change spark.yarn.app.id to spark.app.id --- .../spark/scheduler/cluster/YarnClusterSchedulerBackend.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClusterSchedulerBackend.scala b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClusterSchedulerBackend.scala index aeb218a575455..17e538f529047 100644 --- a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClusterSchedulerBackend.scala +++ b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClusterSchedulerBackend.scala @@ -41,7 +41,7 @@ private[spark] class YarnClusterSchedulerBackend( override def applicationId(): String = // In YARN Cluster mode, the application ID is expected to be set, so log an error if it's // not found. - sc.getConf.getOption("spark.yarn.app.id").getOrElse { + sc.getConf.getOption("spark.app.id").getOrElse { logError("Application ID is not set.") super.applicationId }