diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1b77da3f5a0..19deef0b00b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -64,6 +64,9 @@ Release 2.9.0 - UNRELEASED ApplicationSubmissionContextInfo more consistent. (Xuan Gong via vvasudev) + YARN-4307. Display blacklisted nodes for AM container in the RM web UI. + (Naganarasimha G R via vvasudev) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java index 83fa5dafa8f..58d9066b39c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/hamlet/Hamlet.java @@ -18,10 +18,13 @@ // Generated by HamletGen. Do NOT edit! package org.apache.hadoop.yarn.webapp.hamlet; +import static java.util.EnumSet.of; +import static org.apache.hadoop.yarn.webapp.hamlet.HamletImpl.EOpt.ENDTAG; +import static org.apache.hadoop.yarn.webapp.hamlet.HamletImpl.EOpt.INLINE; +import static org.apache.hadoop.yarn.webapp.hamlet.HamletImpl.EOpt.PRE; + import java.io.PrintWriter; import java.util.EnumSet; -import static java.util.EnumSet.*; -import static org.apache.hadoop.yarn.webapp.hamlet.HamletImpl.EOpt.*; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.yarn.webapp.SubView; @@ -2405,6 +2408,10 @@ public TR th(String selector, String cdata) { return setSelector(th(), selector)._(cdata)._(); } + public TR th(String selector, String title, String cdata) { + return setSelector(th(), selector).$title(title)._(cdata)._(); + } + @Override public TD> td() { closeAttrs(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java index a544ab88e89..c7bd0f8da1c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java @@ -72,11 +72,10 @@ public BlacklistUpdates getBlacklistUpdates() { } ret = new BlacklistUpdates(blacklist, EMPTY_LIST); } else { - if (LOG.isDebugEnabled()) { - LOG.debug("blacklist size " + currentBlacklistSize + " is more than " + - "failure threshold ratio " + blacklistDisableFailureThreshold + - " out of total usable nodes " + numberOfNodeManagerHosts); - } + LOG.warn("Ignoring Blacklists, blacklist size " + currentBlacklistSize + + " is more than failure threshold ratio " + + blacklistDisableFailureThreshold + " out of total usable nodes " + + numberOfNodeManagerHosts); ret = new BlacklistUpdates(EMPTY_LIST, blacklist); } return ret; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java index 91aee402829..f2e60d1207c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt; import java.util.List; +import java.util.Set; import java.util.concurrent.ConcurrentMap; import javax.crypto.SecretKey; @@ -252,4 +253,9 @@ public interface RMAppAttempt extends EventHandler { * @param amLaunchDiagnostics */ void updateAMLaunchDiagnostics(String amLaunchDiagnostics); + + /** + * @return Set of nodes which are blacklisted by the application + */ + Set getBlacklistedNodes(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 16456ae2616..8a9a55e9d06 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -91,7 +92,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptUnregistrationEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeFinishedContainersPulledByAMEvent; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt.AMState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler; @@ -2142,4 +2145,18 @@ public RMAppAttemptState getRecoveredFinalState() { public void setRecoveredFinalState(RMAppAttemptState finalState) { this.recoveredFinalState = finalState; } + + @Override + public Set getBlacklistedNodes() { + if (scheduler instanceof AbstractYarnScheduler) { + AbstractYarnScheduler ayScheduler = + (AbstractYarnScheduler) scheduler; + SchedulerApplicationAttempt attempt = + ayScheduler.getApplicationAttempt(applicationAttemptId); + if (attempt != null) { + return attempt.getBlacklistedNodes(); + } + } + return Collections.EMPTY_SET; + } } 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/RMAppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java index 34ad08a8dfd..668269e819a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java @@ -23,9 +23,11 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._ODD; import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH; +import java.util.Collection; +import java.util.List; + import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ContainerReport; @@ -36,8 +38,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptMetrics; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo; import org.apache.hadoop.yarn.server.webapp.AppAttemptBlock; import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo; @@ -48,11 +48,8 @@ import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.hadoop.yarn.webapp.view.InfoBlock; -import com.google.inject.Inject; -import java.util.List; -import java.util.Collection; -import java.util.Set; +import com.google.inject.Inject; public class RMAppAttemptBlock extends AppAttemptBlock{ @@ -207,14 +204,13 @@ protected void generateOverview(ApplicationAttemptReport appAttemptReport, Collection containers, AppAttemptInfo appAttempt, String node) { - String blacklistedNodes = "-"; - Set nodes = - getBlacklistedNodes(rm, getRMAppAttempt().getAppAttemptId()); - if (nodes != null) { - if (!nodes.isEmpty()) { - blacklistedNodes = StringUtils.join(nodes, ", "); - } - } + RMAppAttempt rmAppAttempt = getRMAppAttempt(); + // nodes which are blacklisted by the application + String appBlacklistedNodes = + getNodeString(rmAppAttempt.getBlacklistedNodes()); + // nodes which are blacklisted by the RM for AM launches + String rmBlackListedNodes = getNodeString( + rmAppAttempt.getAMBlacklist().getBlacklistUpdates().getAdditions()); info("Application Attempt Overview") ._( @@ -248,21 +244,17 @@ protected void generateOverview(ApplicationAttemptReport appAttemptReport, ._( "Diagnostics Info:", appAttempt.getDiagnosticsInfo() == null ? "" : appAttempt - .getDiagnosticsInfo())._("Blacklisted Nodes:", blacklistedNodes); + .getDiagnosticsInfo()) + ._("Application Blacklisted Nodes:", appBlacklistedNodes) + ._("RM Blacklisted Nodes(for AM launches)", rmBlackListedNodes); } - public static Set getBlacklistedNodes(ResourceManager rm, - ApplicationAttemptId appid) { - if (rm.getResourceScheduler() instanceof AbstractYarnScheduler) { - AbstractYarnScheduler ayScheduler = - (AbstractYarnScheduler) rm.getResourceScheduler(); - SchedulerApplicationAttempt attempt = - ayScheduler.getApplicationAttempt(appid); - if (attempt != null) { - return attempt.getBlacklistedNodes(); - } + private String getNodeString(Collection nodes) { + String concatinatedString = "-"; + if (null != nodes && !nodes.isEmpty()) { + concatinatedString = StringUtils.join(nodes, ", "); } - return null; + return concatinatedString; } @Override 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/RMAppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java index eec1fadd815..2d822c15fed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppBlock.java @@ -20,9 +20,10 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._INFO_WRAP; +import java.util.Collection; +import java.util.Set; + import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport; @@ -43,12 +44,8 @@ import com.google.inject.Inject; -import java.util.Collection; -import java.util.Set; - public class RMAppBlock extends AppBlock{ - private static final Log LOG = LogFactory.getLog(RMAppBlock.class); private final ResourceManager rm; private final Configuration conf; @@ -116,7 +113,10 @@ protected void generateApplicationTable(Block html, Hamlet.TBODY> tbody = html.table("#attempts").thead().tr().th(".id", "Attempt ID") .th(".started", "Started").th(".node", "Node").th(".logs", "Logs") - .th(".blacklistednodes", "Blacklisted Nodes")._()._().tbody(); + .th(".appBlacklistednodes", "Nodes black listed by the application", + "App Blacklisted Nodes") + .th(".rmBlacklistednodes", "Nodes black listed by the RM for the" + + " app", "RM Blacklisted Nodes")._()._().tbody(); RMApp rmApp = this.rm.getRMContext().getRMApps().get(this.appID); if (rmApp == null) { @@ -132,13 +132,12 @@ protected void generateApplicationTable(Block html, AppAttemptInfo attemptInfo = new AppAttemptInfo(this.rm, rmAppAttempt, rmApp.getUser(), WebAppUtils.getHttpSchemePrefix(conf)); - String blacklistedNodesCount = "N/A"; - Set nodes = - RMAppAttemptBlock.getBlacklistedNodes(rm, - rmAppAttempt.getAppAttemptId()); - if(nodes != null) { - blacklistedNodesCount = String.valueOf(nodes.size()); - } + Set nodes = rmAppAttempt.getBlacklistedNodes(); + // nodes which are blacklisted by the application + String appBlacklistedNodesCount = String.valueOf(nodes.size()); + // nodes which are blacklisted by the RM for AM launches + String rmBlacklistedNodesCount = String.valueOf(rmAppAttempt + .getAMBlacklist().getBlacklistUpdates().getAdditions().size()); String nodeLink = attemptInfo.getNodeHttpAddress(); if (nodeLink != null) { nodeLink = WebAppUtils.getHttpSchemePrefix(conf) + nodeLink; @@ -158,8 +157,9 @@ protected void generateApplicationTable(Block html, .escapeJavaScript(StringEscapeUtils.escapeHtml(nodeLink))) .append("\",\"") - .append(logsLink == null ? "N/A" : "Logs").append("\",").append( - "\"").append(blacklistedNodesCount).append("\"],\n"); + .append(logsLink == null ? "N/A" : "Logs").append("\",") + .append("\"").append(appBlacklistedNodesCount).append("\",") + .append("\"").append(rmBlacklistedNodesCount).append("\"],\n"); } if (attemptsTableData.charAt(attemptsTableData.length() - 2) == ',') { attemptsTableData.delete(attemptsTableData.length() - 2, 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/RMAppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java index 9f2f30853ee..24a40c1d130 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java @@ -95,8 +95,9 @@ protected void renderData(Block html) { } String blacklistedNodesCount = "N/A"; - Set nodes = - RMAppAttemptBlock.getBlacklistedNodes(rm, appAttemptId); + Set nodes = rm.getRMContext().getRMApps() + .get(appAttemptId.getApplicationId()).getAppAttempts() + .get(appAttemptId).getBlacklistedNodes(); if (nodes != null) { blacklistedNodesCount = String.valueOf(nodes.size()); } 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/AppAttemptInfo.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/AppAttemptInfo.java index f4652586271..60b728ee3b7 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/AppAttemptInfo.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/AppAttemptInfo.java @@ -42,6 +42,7 @@ public class AppAttemptInfo { protected String nodeId; protected String logsLink; protected String blacklistedNodes; + protected String rmBlacklistedNodesForAMLaunches; protected String appAttemptId; public AppAttemptInfo() { @@ -67,6 +68,10 @@ public AppAttemptInfo(ResourceManager rm, RMAppAttempt attempt, String user, this.logsLink = WebAppUtils.getRunningLogURL(schemePrefix + masterContainer.getNodeHttpAddress(), ConverterUtils.toString(masterContainer.getId()), user); + + rmBlacklistedNodesForAMLaunches = StringUtils.join( + attempt.getAMBlacklist().getBlacklistUpdates().getAdditions(), + ", "); if (rm.getResourceScheduler() instanceof AbstractYarnScheduler) { AbstractYarnScheduler ayScheduler = (AbstractYarnScheduler) rm.getResourceScheduler(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 05f141fa287..0328a7a291b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -1643,7 +1643,7 @@ public void verifyAppAttemptsInfo(JSONObject info, RMAppAttempt appAttempt, String user) throws JSONException, Exception { - assertEquals("incorrect number of elements", 9, info.length()); + assertEquals("incorrect number of elements", 10, info.length()); verifyAppAttemptInfoGeneric(appAttempt, info.getInt("id"), info.getLong("startTime"), info.getString("containerId"),