Repository: hadoop Updated Branches: refs/heads/branch-2 92767f956 -> a8ad6b617
YARN-3538. TimelineWebService doesn't catch runtime exception. Contributed by Steve Loughran and Tsuyoshi Ozawa. (cherry picked from commit f05a9ceb4a9623517aa1c8d995805e26ae1bde5a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8ad6b61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8ad6b61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8ad6b61 Branch: refs/heads/branch-2 Commit: a8ad6b61719127aa1b3b4d210f7c589b72cf16fa Parents: 92767f9 Author: Junping Du <[email protected]> Authored: Thu Nov 17 16:55:39 2016 -0800 Committer: Junping Du <[email protected]> Committed: Thu Nov 17 16:56:21 2016 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/timeline/webapp/TimelineWebServices.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8ad6b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/TimelineWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/TimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/TimelineWebServices.java index 5c80132..48ca300 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/TimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/TimelineWebServices.java @@ -261,6 +261,10 @@ public class TimelineWebServices { // The user doesn't have the access to override the existing domain. LOG.error(e.getMessage(), e); throw new ForbiddenException(e); + } catch (RuntimeException e) { + LOG.error("Error putting domain", e); + throw new WebApplicationException(e, + Response.Status.INTERNAL_SERVER_ERROR); } catch (IOException e) { LOG.error("Error putting domain", e); throw new WebApplicationException(e, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
