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

YARN-6872. [Addendum patch] Ensure apps could run given NodeLabels are disabled post RM switchover/restart. Contributed by Sunil G

This commit is contained in:
Jian He 2017-08-02 00:03:25 -07:00
parent 3a0b84d9c9
commit f9139ac8f6
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
View File

@ -519,20 +519,10 @@ public abstract class AbstractYarnScheduler
container.setVersion(status.getVersion());
ApplicationAttemptId attemptId =
container.getId().getApplicationAttemptId();
String labelExpression = status.getNodeLabelExpression();
// If NodeLabel is disabled but recovered container has label expression
// its better to suppress that and considered as default label.
if (!status.getNodeLabelExpression().isEmpty() && !YarnConfiguration
.areNodeLabelsEnabled(rmContext.getYarnConfiguration())) {
labelExpression = RMNodeLabelsManager.NO_LABEL;
}
RMContainer rmContainer =
new RMContainerImpl(container,
SchedulerRequestKey.extractFrom(container), attemptId,
node.getNodeID(), applications.get(
attemptId.getApplicationId()).getUser(), rmContext,
status.getCreationTime(), labelExpression);
RMContainer rmContainer = new RMContainerImpl(container,
SchedulerRequestKey.extractFrom(container), attemptId, node.getNodeID(),
applications.get(attemptId.getApplicationId()).getUser(), rmContext,
status.getCreationTime(), status.getNodeLabelExpression());
return rmContainer;
}

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
View File

@ -524,7 +524,7 @@ public class AppSchedulingInfo {
this.placesBlacklistedByApp = appInfo.getBlackList();
}
public void recoverContainer(RMContainer rmContainer) {
public void recoverContainer(RMContainer rmContainer, String partition) {
try {
this.writeLock.lock();
QueueMetrics metrics = queue.getMetrics();
@ -540,8 +540,8 @@ public class AppSchedulingInfo {
return;
}
metrics.allocateResources(rmContainer.getNodeLabelExpression(),
user, 1, rmContainer.getAllocatedResource(), false);
metrics.allocateResources(partition, user, 1,
rmContainer.getAllocatedResource(), false);
} finally {
this.writeLock.unlock();
}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
View File

@ -1103,7 +1103,7 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
try {
writeLock.lock();
// recover app scheduling info
appSchedulingInfo.recoverContainer(rmContainer);
appSchedulingInfo.recoverContainer(rmContainer, node.getPartition());
if (rmContainer.getState().equals(RMContainerState.COMPLETED)) {
return;