tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TEZ-2833. Dont create extra directory during ATS file download (rbalamohan)
Date Mon, 21 Sep 2015 23:08:39 GMT
Repository: tez
Updated Branches:
  refs/heads/master 62d9853b3 -> 0aa31af23


TEZ-2833. Dont create extra directory during ATS file download (rbalamohan)


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

Branch: refs/heads/master
Commit: 0aa31af23327a0c4e566d38d9d97637792ac3979
Parents: 62d9853
Author: Rajesh Balamohan <rbalamohan@apache.org>
Authored: Tue Sep 22 04:44:00 2015 +0530
Committer: Rajesh Balamohan <rbalamohan@apache.org>
Committed: Tue Sep 22 04:44:00 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../src/main/java/org/apache/tez/history/ATSImportTool.java    | 6 +++---
 .../test/java/org/apache/tez/history/TestHistoryParser.java    | 1 -
 .../src/test/java/org/apache/tez/analyzer/TestAnalyzer.java    | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0aa31af2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ad26eee..b4b91ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.8.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2833. Dont create extra directory during ATS file download
   TEZ-2834. Make Tez preemption resilient to incorrect free resource reported
   by YARN
   TEZ-2775. Improve and consolidate logging in Runtime components.

http://git-wip-us.apache.org/repos/asf/tez/blob/0aa31af2/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
index 737df76..5fddd00 100644
--- a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
+++ b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
@@ -126,10 +126,10 @@ public class ATSImportTool extends Configured implements Tool {
   private final Client httpClient;
   private final TezDAGID tezDAGID;
 
-  public ATSImportTool(String baseUri, String dagId, File baseDownloadDir, int batchSize)
+  public ATSImportTool(String baseUri, String dagId, File downloadDir, int batchSize)
       throws TezException {
     Preconditions.checkArgument(!Strings.isNullOrEmpty(dagId), "dagId can not be null or
empty");
-    Preconditions.checkArgument(baseDownloadDir != null, "downloadDir can not be null");
+    Preconditions.checkArgument(downloadDir != null, "downloadDir can not be null");
     tezDAGID = TezDAGID.fromString(dagId);
 
     this.baseUri = baseUri;
@@ -138,7 +138,7 @@ public class ATSImportTool extends Configured implements Tool {
 
     this.httpClient = getHttpClient();
 
-    this.downloadDir = new File(baseDownloadDir, dagId);
+    this.downloadDir = downloadDir;
     this.zipFile = new File(downloadDir, this.dagId + ".zip");
 
     boolean result = downloadDir.mkdirs();

http://git-wip-us.apache.org/repos/asf/tez/blob/0aa31af2/tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java
b/tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java
index 8dbfdc9..a1b0ba6 100644
--- a/tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java
+++ b/tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java
@@ -577,7 +577,6 @@ public class TestHistoryParser {
   private DagInfo getDagInfo(String dagId) throws TezException {
     //Parse downloaded contents
     File downloadedFile = new File(DOWNLOAD_DIR
-        + Path.SEPARATOR + dagId
         + Path.SEPARATOR + dagId + ".zip");
     ATSFileParser parser = new ATSFileParser(downloadedFile);
     DagInfo dagInfo = parser.getDAGData(dagId);

http://git-wip-us.apache.org/repos/asf/tez/blob/0aa31af2/tez-tools/analyzers/job-analyzer/src/test/java/org/apache/tez/analyzer/TestAnalyzer.java
----------------------------------------------------------------------
diff --git a/tez-tools/analyzers/job-analyzer/src/test/java/org/apache/tez/analyzer/TestAnalyzer.java
b/tez-tools/analyzers/job-analyzer/src/test/java/org/apache/tez/analyzer/TestAnalyzer.java
index 7ea5a39..6606a74 100644
--- a/tez-tools/analyzers/job-analyzer/src/test/java/org/apache/tez/analyzer/TestAnalyzer.java
+++ b/tez-tools/analyzers/job-analyzer/src/test/java/org/apache/tez/analyzer/TestAnalyzer.java
@@ -263,7 +263,6 @@ public class TestAnalyzer {
       //Parse ATS data and verify results
       //Parse downloaded contents
       File downloadedFile = new File(DOWNLOAD_DIR
-          + Path.SEPARATOR + dagId
           + Path.SEPARATOR + dagId + ".zip");
       ATSFileParser parser = new ATSFileParser(downloadedFile);
       dagInfo = parser.getDAGData(dagId);


Mime
View raw message