Log the user class exception

zsxwing · zsxwing · commit 806c93298ae7 · 2015-02-27T17:15:05.000+08:00
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
@@ -486,11 +486,10 @@ private[spark] class ApplicationMaster(
               case _: InterruptedException =>
                 // Reporter thread can interrupt to stop user class
               case cause: Throwable =>
+                logError("User class threw exception: " + cause.getMessage, cause)
                 finish(FinalApplicationStatus.FAILED,
                   ApplicationMaster.EXIT_EXCEPTION_USER_CLASS,
                   "User class threw exception: " + cause.getMessage)
-                // re-throw to get it logged
-                throw cause
             }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -486,11 +486,10 @@ private[spark] class ApplicationMaster(`
`486`	`486`	`case _: InterruptedException =>`
`487`	`487`	`// Reporter thread can interrupt to stop user class`
`488`	`488`	`case cause: Throwable =>`
	`489`	`+ logError("User class threw exception: " + cause.getMessage, cause)`
`489`	`490`	`finish(FinalApplicationStatus.FAILED,`
`490`	`491`	`ApplicationMaster.EXIT_EXCEPTION_USER_CLASS,`
`491`	`492`	`"User class threw exception: " + cause.getMessage)`
`492`		`- // re-throw to get it logged`
`493`		`- throw cause`
`494`	`493`	`}`
`495`	`494`	`}`
`496`	`495`	`}`