tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-302. Fix Tez after YARN-927 (bikas)
Date Wed, 17 Jul 2013 21:31:08 GMT
Updated Branches:
  refs/heads/master 0e2090711 -> 890b130c2


TEZ-302. Fix Tez after YARN-927 (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/890b130c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/890b130c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/890b130c

Branch: refs/heads/master
Commit: 890b130c2762f97362362ecca65388bd38d5945e
Parents: 0e20907
Author: Bikas Saha <bikas@apache.org>
Authored: Wed Jul 17 14:26:34 2013 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Wed Jul 17 14:26:34 2013 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tez/client/TezClient.java       | 8 ++++----
 .../main/java/org/apache/tez/dag/app/rm/TaskScheduler.java   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/890b130c/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
index 0569afa..f855795 100644
--- a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -441,6 +441,10 @@ public class TezClient {
         Environment.CLASSPATH.name(),
         Environment.PWD.$());
 
+    Apps.addToEnvironment(environment,
+        Environment.CLASSPATH.name(),
+        Environment.PWD.$() + File.separator + "*");
+
     // Add YARN/COMMON/HDFS jars to path
     if (!isMiniCluster) {
       for (String c : conf.getStrings(
@@ -451,10 +455,6 @@ public class TezClient {
       }
     }
 
-    Apps.addToEnvironment(environment,
-        Environment.CLASSPATH.name(),
-        Environment.PWD.$() + File.separator + "*");
-
     if (amEnv != null) {
       for (Map.Entry<String, String> entry : amEnv.entrySet()) {
         Apps.addToEnvironment(environment, entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/890b130c/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 88c4330..52f7d89 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
@@ -43,7 +43,7 @@ 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.client.api.AMRMClient.StoredContainerRequest;
+import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
 import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.util.RackResolver;
@@ -126,7 +126,7 @@ public class TaskScheduler extends AbstractService
     Object appCookie;
   }
   
-  class CookieContainerRequest extends StoredContainerRequest {
+  class CookieContainerRequest extends ContainerRequest {
     CRCookie cookie;
     public CookieContainerRequest(Resource capability, String[] hosts,
         String[] racks, Priority priority, CRCookie cookie) {


Mime
View raw message