You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2016/06/01 05:23:58 UTC
[2/7] hadoop git commit: Revert "YARn-4844. Add
getMemoryLong/getVirtualCoreLong to o.a.h.y.api.records.Resource. Contributed
by Wangda Tan."
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
index 547a55d..db28d2d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
@@ -263,88 +263,88 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(22 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(19 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(16 * GB, a.getMetrics().getAvailableMB());
- assertEquals(16 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(16 * GB, app_0.getHeadroom().getMemory());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// try to assign reducer (5G on node 0 and should reserve)
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(11 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(11 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// assign reducer to node 2
a.assignContainers(clusterResource, node_2,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(18 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(18 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(6 * GB, a.getMetrics().getAvailableMB());
- assertEquals(6 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(6 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
assertEquals(1, app_0.getTotalRequiredResources(priorityReduce));
// node_1 heartbeat and unreserves from node_0 in order to allocate
// on node_1
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(18 * GB, a.getUsedResources().getMemorySize());
- assertEquals(18 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(18 * GB, a.getUsedResources().getMemory());
+ assertEquals(18 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(18 * GB, a.getMetrics().getAllocatedMB());
assertEquals(6 * GB, a.getMetrics().getAvailableMB());
- assertEquals(6 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(6 * GB, app_0.getHeadroom().getMemory());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(8 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(8 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
assertEquals(0, app_0.getTotalRequiredResources(priorityReduce));
}
@@ -424,27 +424,27 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
- assertEquals(0 * GB, app_1.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
+ assertEquals(0 * GB, app_1.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(22 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(4 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
- assertEquals(2 * GB, app_1.getCurrentConsumption().getMemorySize());
+ assertEquals(4 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
+ assertEquals(2 * GB, app_1.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(4 * GB, a.getMetrics().getAllocatedMB());
assertEquals(20 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(2 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(2 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Add a few requests to each app
app_0.updateResourceRequests(Collections.singletonList(TestUtils
@@ -457,29 +457,29 @@ public class TestReservations {
// add a reservation for app_0
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(12 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
- assertEquals(2 * GB, app_1.getCurrentConsumption().getMemorySize());
+ assertEquals(12 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
+ assertEquals(2 * GB, app_1.getCurrentConsumption().getMemory());
assertEquals(8 * GB, a.getMetrics().getReservedMB());
assertEquals(4 * GB, a.getMetrics().getAllocatedMB());
assertEquals(12 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(2 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(2 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// next assignment is beyond user limit for user_0 but it should assign to
// app_1 for user_1
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(14 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
- assertEquals(4 * GB, app_1.getCurrentConsumption().getMemorySize());
+ assertEquals(14 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
+ assertEquals(4 * GB, app_1.getCurrentConsumption().getMemory());
assertEquals(8 * GB, a.getMetrics().getReservedMB());
assertEquals(6 * GB, a.getMetrics().getAllocatedMB());
assertEquals(10 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(4 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(4 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
}
@Test
@@ -559,89 +559,89 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(22 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(19 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(16 * GB, a.getMetrics().getAvailableMB());
- assertEquals(16 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(16 * GB, app_0.getHeadroom().getMemory());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// try to assign reducer (5G on node 0 and should reserve)
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(11 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(11 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// assign reducer to node 2
a.assignContainers(clusterResource, node_2,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(18 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(18 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(6 * GB, a.getMetrics().getAvailableMB());
- assertEquals(6 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(6 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
assertEquals(1, app_0.getTotalRequiredResources(priorityReduce));
// node_1 heartbeat and won't unreserve from node_0, potentially stuck
// if AM doesn't handle
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(18 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(18 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(6 * GB, a.getMetrics().getAvailableMB());
- assertEquals(6 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(6 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
assertEquals(1, app_0.getTotalRequiredResources(priorityReduce));
}
@@ -718,66 +718,66 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(14 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(8 * GB, a.getMetrics().getAvailableMB());
- assertEquals(8 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(8 * GB, app_0.getHeadroom().getMemory());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// try to assign reducer (5G on node 0 and should reserve)
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
assertEquals(5 * GB, node_0.getReservedContainer().getReservedResource()
- .getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ .getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
assertEquals(2, app_0.getTotalRequiredResources(priorityReduce));
// could allocate but told need to unreserve first
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(8 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(8 * GB, node_1.getUsedResource().getMemory());
assertEquals(1, app_0.getTotalRequiredResources(priorityReduce));
}
@@ -981,50 +981,50 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(14 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(8 * GB, a.getMetrics().getAvailableMB());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
// now add in reservations and make sure it continues if config set
// allocate to queue so that the potential new capacity is greater then
// absoluteMaxCapacity
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
ResourceLimits limits =
new ResourceLimits(Resources.createResource(13 * GB));
@@ -1037,7 +1037,7 @@ public class TestReservations {
// 16GB total, 13GB consumed (8 allocated, 5 reserved). asking for 5GB so we would have to
// unreserve 2GB to get the total 5GB needed.
// also note vcore checks not enabled
- assertEquals(0, limits.getHeadroom().getMemorySize());
+ assertEquals(0, limits.getHeadroom().getMemory());
refreshQueuesTurnOffReservationsContLook(a, csConf);
@@ -1155,52 +1155,52 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(14 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(8 * GB, a.getMetrics().getAvailableMB());
assertEquals(null, node_0.getReservedContainer());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
// now add in reservations and make sure it continues if config set
// allocate to queue so that the potential new capacity is greater then
// absoluteMaxCapacity
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentReservation().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentReservation().getMemory());
assertEquals(5 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
// not over the limit
Resource limit = Resources.createResource(14 * GB, 0);
@@ -1307,39 +1307,39 @@ public class TestReservations {
// Only AM
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(2 * GB, a.getUsedResources().getMemorySize());
- assertEquals(2 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(2 * GB, a.getUsedResources().getMemory());
+ assertEquals(2 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(2 * GB, a.getMetrics().getAllocatedMB());
assertEquals(22 * GB, a.getMetrics().getAvailableMB());
- assertEquals(2 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(2 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map - simulating reduce
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(5 * GB, a.getUsedResources().getMemorySize());
- assertEquals(5 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(5 * GB, a.getUsedResources().getMemory());
+ assertEquals(5 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(5 * GB, a.getMetrics().getAllocatedMB());
assertEquals(19 * GB, a.getMetrics().getAvailableMB());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// Only 1 map to other node - simulating reduce
a.assignContainers(clusterResource, node_1,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(16 * GB, a.getMetrics().getAvailableMB());
- assertEquals(16 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(16 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// try to assign reducer (5G on node 0), but tell it's resource limits <
// used (8G) + required (5G). It will not reserved since it has to unreserve
@@ -1347,72 +1347,72 @@ public class TestReservations {
// unreserve resource to reserve container.
a.assignContainers(clusterResource, node_0,
new ResourceLimits(Resources.createResource(10 * GB)), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(16 * GB, a.getMetrics().getAvailableMB());
- // app_0's headroom = limit (10G) - used (8G) = 2
- assertEquals(2 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ // app_0's headroom = limit (10G) - used (8G) = 2G
+ assertEquals(2 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// try to assign reducer (5G on node 0), but tell it's resource limits <
// used (8G) + required (5G). It will not reserved since it has to unreserve
// some resource. Unfortunately, there's nothing to unreserve.
a.assignContainers(clusterResource, node_2,
new ResourceLimits(Resources.createResource(10 * GB)), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(8 * GB, a.getUsedResources().getMemorySize());
- assertEquals(8 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(8 * GB, a.getUsedResources().getMemory());
+ assertEquals(8 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(8 * GB, a.getMetrics().getAllocatedMB());
assertEquals(16 * GB, a.getMetrics().getAvailableMB());
- // app_0's headroom = limit (10G) - used (8G) = 2G
- assertEquals(2 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(0 * GB, node_2.getUsedResource().getMemorySize());
+ // app_0's headroom = limit (10G) - used (8G) = 2G
+ assertEquals(2 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(0 * GB, node_2.getUsedResource().getMemory());
// let it assign 5G to node_2
a.assignContainers(clusterResource, node_2,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(13 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(13 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(0 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(11 * GB, a.getMetrics().getAvailableMB());
- assertEquals(11 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(11 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
// reserve 8G node_0
a.assignContainers(clusterResource, node_0,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(21 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(21 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(8 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
// try to assign (8G on node 2). No room to allocate,
// continued to try due to having reservation above,
// but hits queue limits so can't reserve anymore.
a.assignContainers(clusterResource, node_2,
new ResourceLimits(clusterResource), SchedulingMode.RESPECT_PARTITION_EXCLUSIVITY);
- assertEquals(21 * GB, a.getUsedResources().getMemorySize());
- assertEquals(13 * GB, app_0.getCurrentConsumption().getMemorySize());
+ assertEquals(21 * GB, a.getUsedResources().getMemory());
+ assertEquals(13 * GB, app_0.getCurrentConsumption().getMemory());
assertEquals(8 * GB, a.getMetrics().getReservedMB());
assertEquals(13 * GB, a.getMetrics().getAllocatedMB());
assertEquals(3 * GB, a.getMetrics().getAvailableMB());
- assertEquals(3 * GB, app_0.getHeadroom().getMemorySize());
- assertEquals(5 * GB, node_0.getUsedResource().getMemorySize());
- assertEquals(3 * GB, node_1.getUsedResource().getMemorySize());
- assertEquals(5 * GB, node_2.getUsedResource().getMemorySize());
+ assertEquals(3 * GB, app_0.getHeadroom().getMemory());
+ assertEquals(5 * GB, node_0.getUsedResource().getMemory());
+ assertEquals(3 * GB, node_1.getUsedResource().getMemory());
+ assertEquals(5 * GB, node_2.getUsedResource().getMemory());
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestWorkPreservingRMRestartForNodeLabel.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestWorkPreservingRMRestartForNodeLabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestWorkPreservingRMRestartForNodeLabel.java
index 2652d52..eeec940 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestWorkPreservingRMRestartForNodeLabel.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestWorkPreservingRMRestartForNodeLabel.java
@@ -112,14 +112,14 @@ public class TestWorkPreservingRMRestartForNodeLabel {
FiCaSchedulerApp app =
cs.getSchedulerApplications().get(appId).getCurrentAppAttempt();
Assert.assertEquals(expectedMemUsage, app.getAppAttemptResourceUsage()
- .getUsed(partition).getMemorySize());
+ .getUsed(partition).getMemory());
}
private void checkQueueResourceUsage(String partition, String queueName, MockRM rm, int expectedMemUsage) {
CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler();
CSQueue queue = cs.getQueue(queueName);
Assert.assertEquals(expectedMemUsage, queue.getQueueResourceUsage()
- .getUsed(partition).getMemorySize());
+ .getUsed(partition).getMemory());
}
@Test
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestComputeFairShares.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestComputeFairShares.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestComputeFairShares.java
index 4f3ccb2..9d8dd07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestComputeFairShares.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestComputeFairShares.java
@@ -196,7 +196,7 @@ public class TestComputeFairShares {
private void verifyMemoryShares(int... shares) {
Assert.assertEquals(scheds.size(), shares.length);
for (int i = 0; i < shares.length; i++) {
- Assert.assertEquals(shares[i], scheds.get(i).getFairShare().getMemorySize());
+ Assert.assertEquals(shares[i], scheds.get(i).getFairShare().getMemory());
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestContinuousScheduling.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestContinuousScheduling.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestContinuousScheduling.java
index f6c5598..65c80a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestContinuousScheduling.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestContinuousScheduling.java
@@ -104,9 +104,9 @@ public class TestContinuousScheduling extends FairSchedulerTestBase {
// Advance time and let continuous scheduling kick in
mockClock.tickSec(1);
- while (1024 != app.getCurrentConsumption().getMemorySize()) {
+ while (1024 != app.getCurrentConsumption().getMemory()) {
Thread.sleep(100);
}
- assertEquals(1024, app.getCurrentConsumption().getMemorySize());
+ assertEquals(1024, app.getCurrentConsumption().getMemory());
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSAppAttempt.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSAppAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSAppAttempt.java
index 8d799ef..7aa62a8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSAppAttempt.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSAppAttempt.java
@@ -19,29 +19,25 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
-import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+import static org.junit.Assert.assertEquals;
+
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.FairSharePolicy;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.FifoPolicy;
+
import org.apache.hadoop.yarn.util.ControlledClock;
import org.apache.hadoop.yarn.util.resource.Resources;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
public class TestFSAppAttempt extends FairSchedulerTestBase {
@Before
@@ -228,9 +224,9 @@ public class TestFSAppAttempt extends FairSchedulerTestBase {
Mockito.when(mockQueue.getPolicy()).thenReturn(SchedulingPolicy
.getInstance(DominantResourceFairnessPolicy.class));
verifyHeadroom(schedulerApp,
- min(queueStarvation.getMemorySize(),
- clusterAvailable.getMemorySize(),
- queueMaxResourcesAvailable.getMemorySize()),
+ min(queueStarvation.getMemory(),
+ clusterAvailable.getMemory(),
+ queueMaxResourcesAvailable.getMemory()),
min(queueStarvation.getVirtualCores(),
clusterAvailable.getVirtualCores(),
queueMaxResourcesAvailable.getVirtualCores())
@@ -240,9 +236,9 @@ public class TestFSAppAttempt extends FairSchedulerTestBase {
Mockito.when(mockQueue.getPolicy()).thenReturn(SchedulingPolicy
.getInstance(FairSharePolicy.class));
verifyHeadroom(schedulerApp,
- min(queueStarvation.getMemorySize(),
- clusterAvailable.getMemorySize(),
- queueMaxResourcesAvailable.getMemorySize()),
+ min(queueStarvation.getMemory(),
+ clusterAvailable.getMemory(),
+ queueMaxResourcesAvailable.getMemory()),
Math.min(
clusterAvailable.getVirtualCores(),
queueMaxResourcesAvailable.getVirtualCores())
@@ -251,23 +247,23 @@ public class TestFSAppAttempt extends FairSchedulerTestBase {
Mockito.when(mockQueue.getPolicy()).thenReturn(SchedulingPolicy
.getInstance(FifoPolicy.class));
verifyHeadroom(schedulerApp,
- min(queueStarvation.getMemorySize(),
- clusterAvailable.getMemorySize(),
- queueMaxResourcesAvailable.getMemorySize()),
+ min(queueStarvation.getMemory(),
+ clusterAvailable.getMemory(),
+ queueMaxResourcesAvailable.getMemory()),
Math.min(
clusterAvailable.getVirtualCores(),
queueMaxResourcesAvailable.getVirtualCores())
);
}
- private static long min(long value1, long value2, long value3) {
+ private static int min(int value1, int value2, int value3) {
return Math.min(Math.min(value1, value2), value3);
}
protected void verifyHeadroom(FSAppAttempt schedulerApp,
- long expectedMemory, long expectedCPU) {
+ int expectedMemory, int expectedCPU) {
Resource headroom = schedulerApp.getHeadroom();
- assertEquals(expectedMemory, headroom.getMemorySize());
+ assertEquals(expectedMemory, headroom.getMemory());
assertEquals(expectedCPU, headroom.getVirtualCores());
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f3e1d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.java
index ea9a368..7637410 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSLeafQueue.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.resourcemanager.MockNodes;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
@@ -198,7 +199,7 @@ public class TestFSLeafQueue extends FairSchedulerTestBase {
QueueManager queueMgr = scheduler.getQueueManager();
FSLeafQueue queueA = queueMgr.getLeafQueue("queueA", false);
- assertEquals(4 * 1024, queueA.getResourceUsage().getMemorySize());
+ assertEquals(4 * 1024, queueA.getResourceUsage().getMemory());
// Both queue B1 and queue B2 want 3 * 1024
createSchedulingRequest(1 * 1024, "queueB.queueB1", "user1", 3);
@@ -210,8 +211,8 @@ public class TestFSLeafQueue extends FairSchedulerTestBase {
FSLeafQueue queueB1 = queueMgr.getLeafQueue("queueB.queueB1", false);
FSLeafQueue queueB2 = queueMgr.getLeafQueue("queueB.queueB2", false);
- assertEquals(2 * 1024, queueB1.getResourceUsage().getMemorySize());
- assertEquals(2 * 1024, queueB2.getResourceUsage().getMemorySize());
+ assertEquals(2 * 1024, queueB1.getResourceUsage().getMemory());
+ assertEquals(2 * 1024, queueB2.getResourceUsage().getMemory());
// For queue B1, the fairSharePreemptionThreshold is 0.4, and the fair share
// threshold is 1.6 * 1024
@@ -224,8 +225,8 @@ public class TestFSLeafQueue extends FairSchedulerTestBase {
// Node checks in again
scheduler.handle(nodeEvent2);
scheduler.handle(nodeEvent2);
- assertEquals(3 * 1024, queueB1.getResourceUsage().getMemorySize());
- assertEquals(3 * 1024, queueB2.getResourceUsage().getMemorySize());
+ assertEquals(3 * 1024, queueB1.getResourceUsage().getMemory());
+ assertEquals(3 * 1024, queueB2.getResourceUsage().getMemory());
// Both queue B1 and queue B2 usages go to 3 * 1024
assertFalse(queueB1.isStarvedForFairShare());
@@ -270,7 +271,7 @@ public class TestFSLeafQueue extends FairSchedulerTestBase {
QueueManager queueMgr = scheduler.getQueueManager();
FSLeafQueue queueA = queueMgr.getLeafQueue("queueA", false);
- assertEquals(7 * 1024, queueA.getResourceUsage().getMemorySize());
+ assertEquals(7 * 1024, queueA.getResourceUsage().getMemory());
assertEquals(1, queueA.getResourceUsage().getVirtualCores());
// Queue B has 3 reqs :
@@ -285,7 +286,7 @@ public class TestFSLeafQueue extends FairSchedulerTestBase {
}
FSLeafQueue queueB = queueMgr.getLeafQueue("queueB", false);
- assertEquals(3 * 1024, queueB.getResourceUsage().getMemorySize());
+ assertEquals(3 * 1024, queueB.getResourceUsage().getMemory());
assertEquals(6, queueB.getResourceUsage().getVirtualCores());
scheduler.update();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org