Address review comments

andrewor14 · andrewor14 · commit 39e8c7b2e7ba · 2014-09-22T14:16:41.000-07:00
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -77,8 +77,9 @@ private[spark] trait ClientBase extends Logging {
   }
 
   /**
-   * Copy the given file to a remote file system if needed. This is used for preparing
-   * resources for launching the ApplicationMaster container. Exposed for testing.
+   * Copy the given file to a remote file system (e.g. HDFS) if needed.
+   * The file is only copied if the source and destination file systems are different. This is used
+   * for preparing resources for launching the ApplicationMaster container. Exposed for testing.
    */
   def copyFileToRemote(
       destDir: Path,
@@ -409,6 +410,7 @@ private[spark] trait ClientBase extends Logging {
    * Report the state of an application until it has exited, either successfully or
    * due to some failure, then return the application state.
    *
+   * @param appId ID of the application to monitor.
    * @param returnOnRunning Whether to also return the application state when it is RUNNING.
    * @param logApplicationReport Whether to log details of the application report every iteration.
    * @return state of the application, one of FINISHED, FAILED, KILLED, and RUNNING.
@@ -425,9 +427,8 @@ private[spark] trait ClientBase extends Logging {
       val state = report.getYarnApplicationState
 
       if (logApplicationReport) {
-        logInfo(s"Application report from ResourceManager for app ${appId.getId} (state: $state)")
+        logInfo(s"Application report for $appId (state: $state)")
         val details = Seq[(String, String)](
-          ("full identifier", appId.toString),
           ("client token", getClientToken(report)),
           ("diagnostics", report.getDiagnostics),
           ("ApplicationMaster host", report.getHost),
diff --git a/yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala b/yarn/common/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
@@ -107,7 +107,7 @@ private[spark] class YarnClientSchedulerBackend(
         "It might have been killed or unable to launch application master.")
     }
     if (state == YarnApplicationState.RUNNING) {
-      logInfo(s"Application ${appId.getId} has started running.")
+      logInfo(s"Application $appId has started running.")
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private[spark] class YarnClientSchedulerBackend(`
`107`	`107`	`"It might have been killed or unable to launch application master.")`
`108`	`108`	`}`
`109`	`109`	`if (state == YarnApplicationState.RUNNING) {`
`110`		`- logInfo(s"Application ${appId.getId} has started running.")`
	`110`	`+ logInfo(s"Application $appId has started running.")`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`