tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-270. Fix Tez after YARN-851 (bikas).
Date Fri, 21 Jun 2013 01:17:11 GMT
Updated Branches:
  refs/heads/master 8cf2ae4d1 -> 4a388b42a


TEZ-270. Fix Tez after YARN-851 (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/4a388b42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/4a388b42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/4a388b42

Branch: refs/heads/master
Commit: 4a388b42ab56580ef045794bd65c27c6a939bd65
Parents: 8cf2ae4
Author: Bikas Saha <bikas@apache.org>
Authored: Thu Jun 20 18:13:27 2013 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Thu Jun 20 18:13:27 2013 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/tez/dag/app/AppContext.java   |  5 -----
 .../main/java/org/apache/tez/dag/app/DAGAppMaster.java | 13 -------------
 .../tez/dag/app/launcher/ContainerLauncherImpl.java    |  2 +-
 .../java/org/apache/tez/dag/app/rm/TaskScheduler.java  |  6 ------
 .../tez/dag/app/rm/TaskSchedulerEventHandler.java      |  1 -
 5 files changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4a388b42/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java b/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
index 3d6a946..50580db 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
@@ -19,13 +19,11 @@
 package org.apache.tez.dag.app;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.api.records.Token;
 import org.apache.hadoop.yarn.event.EventHandler;
 import org.apache.hadoop.yarn.util.Clock;
 import org.apache.tez.dag.app.dag.DAG;
@@ -40,9 +38,6 @@ import org.apache.tez.dag.records.TezDAGID;
  */
 @InterfaceAudience.Private
 public interface AppContext {
-
-  ConcurrentMap<String, Token> getNMTokens();
-  void setNMTokens(ConcurrentMap<String, org.apache.hadoop.yarn.api.records.Token>
tokens);
   
   DAGAppMaster getAppMaster();
   

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4a388b42/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index c980d9a..17f4614 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -27,7 +27,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -282,7 +281,6 @@ public class DAGAppMaster extends CompositeService {
     //    TODO XXX: Rename to NMComm
     //    corresponding service to launch allocated containers via NodeManager
     //    containerLauncher = createNMCommunicator(context);
-    // needs to start after TaskScheduler for nmtokens to be available
     containerLauncher = createContainerLauncher(context);
     addIfService(containerLauncher);
     dispatcher.register(NMCommunicatorEventType.class, containerLauncher);
@@ -748,7 +746,6 @@ public class DAGAppMaster extends CompositeService {
     private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
     private final Lock rLock = rwLock.readLock();
     private final Lock wLock = rwLock.writeLock();
-    private ConcurrentMap<String, org.apache.hadoop.yarn.api.records.Token> nmTokens;
     public RunningAppContext(TezConfiguration config) {
       this.conf = config;
     }
@@ -852,16 +849,6 @@ public class DAGAppMaster extends CompositeService {
       }
     }
     
-    @Override
-    public void setNMTokens(ConcurrentMap<String, org.apache.hadoop.yarn.api.records.Token>
tokens) {
-      nmTokens = tokens;
-    }
-
-    @Override
-    public ConcurrentMap<String, org.apache.hadoop.yarn.api.records.Token> getNMTokens()
{
-      return nmTokens;
-    }
-
   }
 
   @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4a388b42/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
index 2c10a59..73f6a48 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
@@ -264,7 +264,7 @@ public class ContainerLauncherImpl extends AbstractService implements
   @Override
   public void serviceStart() {
     cmProxy =
-        new ContainerManagementProtocolProxy(getConfig(), context.getNMTokens());
+        new ContainerManagementProtocolProxy(getConfig());
 
     ThreadFactory tf = new ThreadFactoryBuilder().setNameFormat(
         "ContainerLauncher #%d").setDaemon(true).build();

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4a388b42/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 0567586..4fcca14 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
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +42,6 @@ import org.apache.hadoop.yarn.api.records.NodeReport;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
-import org.apache.hadoop.yarn.api.records.Token;
 import org.apache.hadoop.yarn.client.api.AMRMClient.StoredContainerRequest;
 import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
 import org.apache.hadoop.yarn.exceptions.YarnException;
@@ -373,10 +371,6 @@ public class TaskScheduler extends AbstractService
     appClient.onError(e);
   }
   
-  public ConcurrentMap<String, Token> getNMTokens() {
-    return amRmClient.getNMTokens();
-  }
-  
   public synchronized Resource getTotalResources() {
     return totalResources;
   }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4a388b42/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 1f2ece5..b00b195 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
@@ -328,7 +328,6 @@ public class TaskSchedulerEventHandler extends AbstractService
 
     dagAppMaster = appContext.getAppMaster();
     taskScheduler.start();
-    appContext.setNMTokens(taskScheduler.getNMTokens());
     this.eventHandlingThread = new Thread() {
       @Override
       public void run() {


Mime
View raw message