diff options
author | Cheolsoo Park <cheolsoop@netflix.com> | 2015-02-26 13:53:49 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-02-26 13:53:49 -0800 |
commit | 5f3238b3b0157091d28803aa3b1d248dfa6cdc59 (patch) | |
tree | 92b3e7efe35c8cd230b8f7182c1b871ac1d6c888 | |
parent | aa63f633d39efa8c29095295f161eaad5495071d (diff) | |
download | spark-5f3238b3b0157091d28803aa3b1d248dfa6cdc59.tar.gz spark-5f3238b3b0157091d28803aa3b1d248dfa6cdc59.tar.bz2 spark-5f3238b3b0157091d28803aa3b1d248dfa6cdc59.zip |
[SPARK-6018] [YARN] NoSuchMethodError in Spark app is swallowed by YARN AM
Author: Cheolsoo Park <cheolsoop@netflix.com>
Closes #4773 from piaozhexiu/SPARK-6018 and squashes the following commits:
2a919d5 [Cheolsoo Park] Rename e with cause to avoid duplicate names
1e71d2d [Cheolsoo Park] Replace placeholder with throwable
eb5750d [Cheolsoo Park] NoSuchMethodError in Spark app is swallowed by YARN AM
-rw-r--r-- | yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala | 6 |
1 files changed, 3 insertions, 3 deletions
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 a9bf861d16..20fc19166a 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 @@ -485,12 +485,12 @@ private[spark] class ApplicationMaster( e.getCause match { case _: InterruptedException => // Reporter thread can interrupt to stop user class - case e: Exception => + case cause: Throwable => finish(FinalApplicationStatus.FAILED, ApplicationMaster.EXIT_EXCEPTION_USER_CLASS, - "User class threw exception: " + e.getMessage) + "User class threw exception: " + cause.getMessage) // re-throw to get it logged - throw e + throw cause } } } |