hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [1/2] hadoop git commit: YARN-4718. Rename variables in SchedulerNode to reduce ambiguity post YARN-1011. (Inigo Goiri via kasha)
Date Sun, 28 Feb 2016 18:16:17 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 090f74c74 -> f3b37d802


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3b37d80/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.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/TestFairScheduler.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/TestFairScheduler.java
index 7f9094f..a196576 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/TestFairScheduler.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/TestFairScheduler.java
@@ -4433,7 +4433,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
     // Assert.assertEquals(1 * GB, nm_0.getUsed().getMemory());
     Resource usedResource =
         resourceManager.getResourceScheduler()
-            .getSchedulerNode(nm_0.getNodeId()).getUsedResource();
+            .getSchedulerNode(nm_0.getNodeId()).getAllocatedResource();
     Assert.assertEquals(usedResource.getMemory(), 0);
     Assert.assertEquals(usedResource.getVirtualCores(), 0);
     // Check total resource of scheduler node is also changed to 0 GB 0 core
@@ -4445,7 +4445,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
     // Check the available resource is 0/0
     Resource availableResource =
         resourceManager.getResourceScheduler()
-            .getSchedulerNode(nm_0.getNodeId()).getAvailableResource();
+            .getSchedulerNode(nm_0.getNodeId()).getUnallocatedResource();
     Assert.assertEquals(availableResource.getMemory(), 0);
     Assert.assertEquals(availableResource.getVirtualCores(), 0);
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3b37d80/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.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/fifo/TestFifoScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index 86a017e..9bfc283 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -348,7 +348,7 @@ public class TestFifoScheduler {
     assertEquals(schedulerNodes.get(node0.getNodeID()).getTotalResource()
         .getMemory(), 1024);
     assertEquals(schedulerNodes.get(node0.getNodeID()).
-        getAvailableResource().getMemory(), 1024);
+        getUnallocatedResource().getMemory(), 1024);
     QueueInfo queueInfo = scheduler.getQueueInfo(null, false, false);
     Assert.assertEquals(0.0f, queueInfo.getCurrentCapacity(), 0.0f);
     
@@ -1247,7 +1247,7 @@ public class TestFifoScheduler {
     // Assert.assertEquals(1 * GB, nm_0.getUsed().getMemory());
     Resource usedResource =
         resourceManager.getResourceScheduler()
-            .getSchedulerNode(nm_0.getNodeId()).getUsedResource();
+            .getSchedulerNode(nm_0.getNodeId()).getAllocatedResource();
     Assert.assertEquals(usedResource.getMemory(), 1 * GB);
     Assert.assertEquals(usedResource.getVirtualCores(), 1);
     // Check total resource of scheduler node is also changed to 1 GB 1 core
@@ -1259,7 +1259,7 @@ public class TestFifoScheduler {
     // Check the available resource is 0/0
     Resource availableResource =
         resourceManager.getResourceScheduler()
-            .getSchedulerNode(nm_0.getNodeId()).getAvailableResource();
+            .getSchedulerNode(nm_0.getNodeId()).getUnallocatedResource();
     Assert.assertEquals(availableResource.getMemory(), 0);
     Assert.assertEquals(availableResource.getVirtualCores(), 0);
   }


Mime
View raw message