tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-259. Fix build break from YARN-850 (bikas)
Date Tue, 18 Jun 2013 22:52:27 GMT
Updated Branches:
  refs/heads/master c35702d6f -> 524f4624c


TEZ-259. Fix build break from YARN-850 (bikas)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/524f4624
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/524f4624
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/524f4624

Branch: refs/heads/master
Commit: 524f4624cf3e69bc0837c4bdcf32039c7f4cc0eb
Parents: c35702d
Author: Bikas Saha <bikas@apache.org>
Authored: Tue Jun 18 15:13:45 2013 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Tue Jun 18 15:13:45 2013 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java | 6 +++---
 .../org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java   | 2 +-
 .../test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/524f4624/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
index 4035545..f8ae006 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
@@ -164,8 +164,8 @@ public class TaskScheduler extends AbstractService
     this.appTrackingUrl = appTrackingUrl;
   }
   
-  public Resource getClusterAvailableResources() {
-    return amRmClient.getClusterAvailableResources();
+  public Resource getAvailableResources() {
+    return amRmClient.getAvailableResources();
   }
   
   public int getClusterNodeCount() {
@@ -351,7 +351,7 @@ public class TaskScheduler extends AbstractService
       // TODO this will not handle dynamic changes
       // assume this is the first allocate callback. nothing is allocated.
       // available resource = totalResource
-      Resource freeResource = getClusterAvailableResources();
+      Resource freeResource = getAvailableResources();
       totalResources.setMemory(freeResource.getMemory());
       totalResources.setVirtualCores(freeResource.getVirtualCores());
       LOG.info("App total resource: " + totalResources.getMemory() + 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/524f4624/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
index 3477dec..cbae332 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
@@ -98,7 +98,7 @@ public class TaskSchedulerEventHandler extends AbstractService
   }
   
   public Resource getAvailableResources() {
-    return taskScheduler.getClusterAvailableResources();
+    return taskScheduler.getAvailableResources();
   }
   
   public Resource getTotalResources() {

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/524f4624/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
index 7832aac..8a14281 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
@@ -108,10 +108,10 @@ public class TestTaskScheduler {
     Assert.assertEquals(5, scheduler.getClusterNodeCount());
     
     Resource mockClusterResource = mock(Resource.class);
-    when(mockRMClient.getClusterAvailableResources()).
+    when(mockRMClient.getAvailableResources()).
                                               thenReturn(mockClusterResource);
     Assert.assertEquals(mockClusterResource, 
-                        mockRMClient.getClusterAvailableResources());
+                        mockRMClient.getAvailableResources());
     
     Object mockTask1 = mock(Object.class);
     Object mockCookie1 = mock(Object.class);


Mime
View raw message