tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-187. Fix build break from YARN-759 (bikas)
Date Fri, 07 Jun 2013 03:00:53 GMT
Updated Branches:
  refs/heads/master c6177fbee -> 5795b852b


TEZ-187. Fix build break from YARN-759 (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/5795b852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/5795b852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/5795b852

Branch: refs/heads/master
Commit: 5795b852b1ab372fc2c614b4f3aa57c1943c87d5
Parents: c6177fb
Author: Bikas Saha <bikas@apache.org>
Authored: Thu Jun 6 19:57:54 2013 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Thu Jun 6 19:57:54 2013 -0700

----------------------------------------------------------------------
 .../org/apache/tez/dag/app/rm/TaskScheduler.java   |    6 +++---
 .../tez/dag/app/rm/TaskSchedulerEventHandler.java  |    2 +-
 .../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/5795b852/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 58795d7..5ccf2ac 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
@@ -88,7 +88,7 @@ public class TaskScheduler extends AbstractService
     public void containerCompleted(Object taskLastAllocated, 
                                     ContainerStatus containerStatus);
     public void nodesUpdated(List<NodeReport> updatedNodes);
-    public void appRebootRequested();
+    public void appShutdownRequested();
     public void setApplicationRegistrationData(
                                 Resource minContainerCapability,
                                 Resource maxContainerCapability,
@@ -329,12 +329,12 @@ public class TaskScheduler extends AbstractService
   }
 
   @Override
-  public void onRebootRequest() {
+  public void onShutdownRequest() {
     if(isStopped) {
       return;
     }
     // upcall to app must be outside locks
-    appClient.appRebootRequested();
+    appClient.appShutdownRequested();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5795b852/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 7d55bec..0c68b89 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
@@ -490,7 +490,7 @@ public class TaskSchedulerEventHandler extends AbstractService
   }
 
   @Override
-  public synchronized void appRebootRequested() {
+  public synchronized void appShutdownRequested() {
     // This can happen if the RM has been restarted. If it is in that state,
     // this application must clean itself up.
     // TODO TEZ-34 change event to reboot and send to app master

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5795b852/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 7036e09..5f66cf2 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
@@ -315,8 +315,8 @@ public class TestTaskScheduler {
     scheduler.onError(mockException);
     verify(mockApp).onError(mockException);
     
-    scheduler.onRebootRequest();
-    verify(mockApp).appRebootRequested();
+    scheduler.onShutdownRequest();
+    verify(mockApp).appShutdownRequested();
     
     String appMsg = "success";
     AppFinalStatus finalStatus = 


Mime
View raw message