You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/09/29 02:35:17 UTC

[11/50] [abbrv] git commit: TEZ-1574. Support additional formats for the tez deployed archive. (sseth)

TEZ-1574. Support additional formats for the tez deployed archive.
(sseth)


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

Branch: refs/heads/branch-0.5
Commit: d1ea44d0b4f53f729fc7842b5325d0f941b6dd1c
Parents: e709d62
Author: Siddharth Seth <ss...@apache.org>
Authored: Fri Sep 12 03:17:49 2014 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Fri Sep 12 03:17:49 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../src/main/java/org/apache/tez/client/TezClientUtils.java    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/d1ea44d0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4abc9bf..ff53e04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,7 @@ ALL CHANGES
   TEZ-1362. Remove DAG_COMPLETED in DAGEventType.
   TEZ-1519. TezTaskRunner should not initialize TezConfiguration in TezChild.
   TEZ-1534. Make client side configs available to AM and tasks.
+  TEZ-1574. Support additional formats for the tez deployed archive
 
 Release 0.5.0: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/d1ea44d0/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index adda0a9..3297adc 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -171,7 +171,11 @@ public class TezClientUtils {
      
       List<Path> tezJarPaths = Lists.newArrayListWithCapacity(tezJarUris.length);
 
-      if (tezJarUris.length == 1 && (tezJarUris[0].endsWith(".tar.gz") || tezJarUris[0].endsWith(".tgz"))) {
+      if (tezJarUris.length == 1 && (
+              tezJarUris[0].endsWith(".tar.gz") ||
+              tezJarUris[0].endsWith(".tgz") ||
+              tezJarUris[0].endsWith(".zip") ||
+              tezJarUris[0].endsWith(".tar"))) {
         String fileName = tezJarUris[0];
         if (fileName.endsWith(".tar.gz") || fileName.endsWith(".tgz")) {
           FileStatus fStatus = getLRFileStatus(fileName, conf, false)[0];