review commit

witgo · witgo · commit 9655aa8c8e99 · 2014-09-25T21:48:17.000+08:00
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -211,7 +211,6 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
 
     // In client mode the actor will stop the reporter thread.
     reporterThread.join()
-    finalStatus = FinalApplicationStatus.SUCCEEDED
   }
 
   private def launchReporterThread(): Thread = {
@@ -412,7 +411,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
         }
         catch {
           case e: SecurityException =>
-            logError("setSecurityManager:", e)
+            logError("Error in setSecurityManager:", e)
         }
 
         Utils.tryOrExit {

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,`
`211`	`211`
`212`	`212`	`// In client mode the actor will stop the reporter thread.`
`213`	`213`	`reporterThread.join()`
`214`		`- finalStatus = FinalApplicationStatus.SUCCEEDED`
`215`	`214`	`}`
`216`	`215`
`217`	`216`	`private def launchReporterThread(): Thread = {`
`@@ -412,7 +411,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,`
`412`	`411`	`}`
`413`	`412`	`catch {`
`414`	`413`	`case e: SecurityException =>`
`415`		`- logError("setSecurityManager:", e)`
	`414`	`+ logError("Error in setSecurityManager:", e)`
`416`	`415`	`}`
`417`	`416`
`418`	`417`	`Utils.tryOrExit {`