Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 1352637:1352638 from trunk. FIXES: MAPREDUCE-4295 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352639 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-06-21 18:15:13 +00:00
parent 2d734774a1
commit 22d23a4d0f
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -482,6 +482,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves) MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves)
MAPREDUCE-4295. RM crashes due to DNS issue (tgraves)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
View File

@ -1180,9 +1180,16 @@ public class LeafQueue implements CSQueue {
if (UserGroupInformation.isSecurityEnabled()) { if (UserGroupInformation.isSecurityEnabled()) {
ContainerTokenIdentifier tokenIdentifier = new ContainerTokenIdentifier( ContainerTokenIdentifier tokenIdentifier = new ContainerTokenIdentifier(
containerId, nodeId.toString(), capability); containerId, nodeId.toString(), capability);
try {
containerToken = BuilderUtils.newContainerToken(nodeId, ByteBuffer containerToken = BuilderUtils.newContainerToken(nodeId, ByteBuffer
.wrap(containerTokenSecretManager .wrap(containerTokenSecretManager
.createPassword(tokenIdentifier)), tokenIdentifier); .createPassword(tokenIdentifier)), tokenIdentifier);
} catch (IllegalArgumentException e) {
// this could be because DNS is down - in which case we just want
// to retry and not bring RM down
LOG.error("Error trying to create new container", e);
return null;
}
} }
// Create the container // Create the container
@ -1212,6 +1219,11 @@ public class LeafQueue implements CSQueue {
Container container = Container container =
getContainer(rmContainer, application, node, capability, priority); getContainer(rmContainer, application, node, capability, priority);
// something went wrong getting/creating the container
if (container == null) {
return Resources.none();
}
// Can we allocate a container on this node? // Can we allocate a container on this node?
int availableContainers = int availableContainers =
available.getMemory() / capability.getMemory(); available.getMemory() / capability.getMemory();