diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/NodeStatusPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/NodeStatusPBImpl.java index 2d139fe..7d4e83f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/NodeStatusPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/impl/pb/NodeStatusPBImpl.java @@ -293,7 +293,7 @@ public synchronized void setNodeHealthStatus(NodeHealthStatus healthStatus) { } @Override - public ResourceUtilization getContainersUtilization() { + public synchronized ResourceUtilization getContainersUtilization() { NodeStatusProtoOrBuilder p = this.viaProto ? this.proto : this.builder; if (!p.hasContainersUtilization()) { @@ -303,7 +303,7 @@ public ResourceUtilization getContainersUtilization() { } @Override - public void setContainersUtilization( + public synchronized void setContainersUtilization( ResourceUtilization containersUtilization) { maybeInitBuilder(); if (containersUtilization == null) { @@ -315,7 +315,7 @@ public void setContainersUtilization( } @Override - public ResourceUtilization getNodeUtilization() { + public synchronized ResourceUtilization getNodeUtilization() { NodeStatusProtoOrBuilder p = this.viaProto ? this.proto : this.builder; if (!p.hasNodeUtilization()) { @@ -325,7 +325,7 @@ public ResourceUtilization getNodeUtilization() { } @Override - public void setNodeUtilization( + public synchronized void setNodeUtilization( ResourceUtilization nodeUtilization) { maybeInitBuilder(); if (nodeUtilization == null) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java index ffc5637..f32dd0c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java @@ -51,8 +51,7 @@ private static String getAppsTableColumnDefs( sb.append("[\n") .append("{'sType':'string', 'aTargets': [0]") .append(", 'mRender': parseHadoopID }") - .append("\n, {'sType':'numeric', 'aTargets': " + - (isFairSchedulerPage ? "[6, 7]": "[6, 7]")) + .append("\n, {'sType':'numeric', 'aTargets': [6, 7]") .append(", 'mRender': renderHadoopDate }") .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets':"); if (isFairSchedulerPage) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebServices.java index 8c28263..40e40c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebServices.java @@ -167,6 +167,9 @@ public AppsInfo getApps(HttpServletRequest req, HttpServletResponse res, } catch (Exception e) { rewrapAndThrowException(e); } + if (appReports == null) { + return allApps; + } for (ApplicationReport appReport : appReports) { if (checkAppStates && @@ -266,6 +269,9 @@ public AppAttemptsInfo getAppAttempts(HttpServletRequest req, rewrapAndThrowException(e); } AppAttemptsInfo appAttemptsInfo = new AppAttemptsInfo(); + if (appAttemptReports == null) { + return appAttemptsInfo; + } for (ApplicationAttemptReport appAttemptReport : appAttemptReports) { AppAttemptInfo appAttemptInfo = new AppAttemptInfo(appAttemptReport); appAttemptsInfo.add(appAttemptInfo); @@ -336,6 +342,9 @@ public ContainersInfo getContainers(HttpServletRequest req, rewrapAndThrowException(e); } ContainersInfo containersInfo = new ContainersInfo(); + if (containerReports == null) { + return containersInfo; + } for (ContainerReport containerReport : containerReports) { ContainerInfo containerInfo = new ContainerInfo(containerReport); containersInfo.add(containerInfo);