This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 723f1f6 YARN-4575. ApplicationResourceUsageReport should return ALL
reserved resource. Contributed by Bibin Chundatt and Eric Payne.
723f1f6 is described below
commit 723f1f61d681c137cb2ba224b80a1391bac48aa9
Author: Eric Badger <[email protected]>
AuthorDate: Wed Aug 5 18:56:56 2020 +0000
YARN-4575. ApplicationResourceUsageReport should return ALL reserved
resource.
Contributed by Bibin Chundatt and Eric Payne.
(cherry picked from commit 5edd8b925ef22b83350a21abed6ecc551adb92ee)
---
.../scheduler/SchedulerApplicationAttempt.java | 4 +--
.../scheduler/common/fica/FiCaSchedulerApp.java | 3 +-
.../scheduler/TestSchedulerApplicationAttempt.java | 38 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
index 657c03c..4a8f670 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
@@ -1126,8 +1126,8 @@ public class SchedulerApplicationAttempt implements
SchedulableEntity {
getRunningAggregateAppResourceUsage();
Resource usedResourceClone = Resources.clone(
attemptResourceUsage.getAllUsed());
- Resource reservedResourceClone = Resources.clone(
- attemptResourceUsage.getReserved());
+ Resource reservedResourceClone =
+ Resources.clone(attemptResourceUsage.getAllReserved());
Resource cluster = rmContext.getScheduler().getClusterResource();
ResourceCalculator calc =
rmContext.getScheduler().getResourceCalculator();
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index cf6ffd9..6542d1a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -736,7 +736,8 @@ public class FiCaSchedulerApp extends
SchedulerApplicationAttempt {
+ " on node " + node + ", currently has "
+ reservedContainers.size()
+ " at priority " + schedulerKey.getPriority()
- + "; currentReservation " + this.attemptResourceUsage.getReserved()
+ + "; currentReservation "
+ + this.attemptResourceUsage.getReserved(node.getPartition())
+ " on node-label=" + node.getPartition());
return true;
}
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/TestSchedulerApplicationAttempt.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java
index 6669820..b1080f7 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java
@@ -47,6 +47,7 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Scheduli
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+import org.apache.hadoop.yarn.util.resource.Resources;
import org.junit.After;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -321,6 +322,43 @@ public class TestSchedulerApplicationAttempt {
}
@Test
+ public void testAllResourceUsage() throws Exception {
+ FifoScheduler scheduler = mock(FifoScheduler.class);
+ when(scheduler.getClusterResource()).thenReturn(Resource.newInstance(0,
0));
+ when(scheduler.getResourceCalculator())
+ .thenReturn(new DefaultResourceCalculator());
+
+ ApplicationAttemptId appAttId = createAppAttemptId(0, 0);
+ RMContext rmContext = mock(RMContext.class);
+ when(rmContext.getEpoch()).thenReturn(3L);
+ when(rmContext.getScheduler()).thenReturn(scheduler);
+ when(rmContext.getYarnConfiguration()).thenReturn(conf);
+
+ final String user = "user1";
+ Queue queue = createQueue("test", null);
+ SchedulerApplicationAttempt app = new SchedulerApplicationAttempt(appAttId,
+ user, queue, queue.getAbstractUsersManager(), rmContext);
+
+ // Resource request
+ Resource requestedResource = Resource.newInstance(1536, 2);
+ app.attemptResourceUsage.incUsed("X", requestedResource);
+ app.attemptResourceUsage.incUsed("Y", requestedResource);
+ Resource r2 = Resource.newInstance(1024, 1);
+ app.attemptResourceUsage.incReserved("X", r2);
+ app.attemptResourceUsage.incReserved("Y", r2);
+
+ assertTrue("getUsedResources expected " + Resource.newInstance(3072, 4)
+ + " but was " +
app.getResourceUsageReport().getUsedResources(),
+ Resources.equals(Resource.newInstance(3072, 4),
+ app.getResourceUsageReport().getUsedResources()));
+ assertTrue("getReservedResources expected " + Resource.newInstance(2048, 2)
+ + " but was "
+ + app.getResourceUsageReport().getReservedResources(),
+ Resources.equals(Resource.newInstance(2048, 2),
+ app.getResourceUsageReport().getReservedResources()));
+ }
+
+ @Test
public void testSchedulingOpportunityOverflow() throws Exception {
ApplicationAttemptId attemptId = createAppAttemptId(0, 0);
Queue queue = createQueue("test", null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
