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

YARN-10428. Zombie applications in the YARN queue using FAIR + sizebasedweight. Contributed by Guang Yang, Andras Gyori 

(cherry picked from commit 79a46599f7)

 Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java
This commit is contained in:
Szilard Nemeth 2021-02-05 17:08:16 +01:00 committed by Akira Ajisaka
parent 5c9ab0ce09
commit 7aea2e1b5c
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,10 +69,12 @@ public class FairOrderingPolicy<S extends SchedulableEntity> extends AbstractCom
private double getMagnitude(SchedulableEntity r) {
double mag = r.getSchedulingResourceUsage().getCachedUsed(
CommonNodeLabelsManager.ANY).getMemorySize();
if (sizeBasedWeight) {
if (sizeBasedWeight && mag != 0) {
double weight = Math.log1p(r.getSchedulingResourceUsage().getCachedDemand(
CommonNodeLabelsManager.ANY).getMemorySize()) / Math.log(2);
mag = mag / weight;
if (weight != 0) {
mag = mag / weight;
}
}
return mag;
}

41
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/TestFairOrderingPolicy.java
View File

@ -21,7 +21,9 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy;
import java.util.*;
import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
@ -201,4 +203,43 @@ public class TestFairOrderingPolicy {
}
}
@Test
public void testRemoveEntitiesWithSizeBasedWeightAsCompletedJobs() {
FairOrderingPolicy<MockSchedulableEntity> policy =
new FairOrderingPolicy<MockSchedulableEntity>();
policy.setSizeBasedWeight(true);
// Add 10 different schedulable entities
List<MockSchedulableEntity> entities = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
MockSchedulableEntity r = new MockSchedulableEntity();
r.setApplicationPriority(Priority.newInstance(i));
r.setUsed(Resources.createResource(4 * i));
r.setPending(Resources.createResource(4 * i));
AbstractComparatorOrderingPolicy.updateSchedulingResourceUsage(
r.getSchedulingResourceUsage());
policy.addSchedulableEntity(r);
entities.add(r);
}
// Mark the first 5 entities as completed by setting
// the resources to 0
for (int i = 0; i < 5; i++) {
MockSchedulableEntity r = entities.get(i);
r.getSchedulingResourceUsage().setCachedUsed(
CommonNodeLabelsManager.ANY, Resources.createResource(0));
r.getSchedulingResourceUsage().setCachedPending(
CommonNodeLabelsManager.ANY, Resources.createResource(0));
policy.entityRequiresReordering(r);
}
policy.reorderScheduleEntities();
// Remove the first 5 elements
for (int i = 0; i < 5; i++) {
policy.removeSchedulableEntity(entities.get(i));
}
Assert.assertEquals(5, policy.getNumSchedulableEntities());
}
}