YARN-7375. Possible NPE in RMWebapp when HA is enabled and the active RM fails. Contributed by Chandni Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/792388e1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/792388e1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/792388e1 Branch: refs/heads/HDFS-7240 Commit: 792388e1c0ebaeb01db194412e30c08c0144b77c Parents: cd2a1dd Author: Sunil G <[email protected]> Authored: Fri Oct 27 20:53:57 2017 +0530 Committer: Sunil G <[email protected]> Committed: Fri Oct 27 20:53:57 2017 +0530 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/792388e1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java index 40d7b4c..0711b45 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java @@ -304,19 +304,19 @@ public class AppInfo { if (!deSelects.contains(DeSelectType.TIMEOUTS)) { Map<ApplicationTimeoutType, Long> applicationTimeouts = app.getApplicationTimeouts(); + timeouts = new AppTimeoutsInfo(); if (applicationTimeouts.isEmpty()) { // If application is not set timeout, lifetime should be sent // as default with expiryTime=UNLIMITED and remainingTime=-1 AppTimeoutInfo timeoutInfo = new AppTimeoutInfo(); timeoutInfo.setTimeoutType(ApplicationTimeoutType.LIFETIME); - timeouts = new AppTimeoutsInfo(); timeouts.add(timeoutInfo); } else { for (Map.Entry<ApplicationTimeoutType, Long> entry : app .getApplicationTimeouts().entrySet()) { AppTimeoutInfo timeout = new AppTimeoutInfo(); timeout.setTimeoutType(entry.getKey()); - long timeoutInMillis = entry.getValue().longValue(); + long timeoutInMillis = entry.getValue(); timeout.setExpiryTime(Times.formatISO8601(timeoutInMillis)); if (app.isAppInCompletedStates()) { timeout.setRemainingTime(0); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
