[1/2] tez git commit: TEZ-3304. TestHistoryParser fails with Hadoop 2.7. (Jonathan Eagles via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 a337b70f3 -> daf736929


TEZ-3304. TestHistoryParser fails with Hadoop 2.7. (Jonathan Eagles via hitesh)

(cherry picked from commit 61d5d5e735e38c917a170fa4cc7846d6c38dcdea)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.8
Commit: 85242ae0d6760c3457391209015a80e0eccc28a8
Parents: a337b70
Author: Hitesh Shah <hit...@apache.org>
Authored: Thu Jun 16 16:05:54 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Thu Jun 16 16:10:54 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                               |  3 ++-
 .../java/org/apache/tez/history/TestHistoryParser.java    | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/85242ae0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8a21f26..bb0d29f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3304. TestHistoryParser fails with Hadoop 2.7.
   TEZ-3296. Tez job can hang if two vertices at the same root distance have 
different task requirements
   TEZ-3294. DAG.createDag() does not clear local state on repeat calls.
   TEZ-3297. Deadlock scenario in AM during ShuffleVertexManager auto reduce.
@@ -464,8 +465,8 @@ Release 0.7.2: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
-=======
 
+  TEZ-3304. TestHistoryParser fails with Hadoop 2.7.
   TEZ-3296. Tez job can hang if two vertices at the same root distance have 
different task requirements
   TEZ-3297. Deadlock scenario in AM during ShuffleVertexManager auto reduce.
   TEZ-3296. Tez fails to compile against hadoop 2.8 after MAPREDUCE-5870

http://git-wip-us.apache.org/repos/asf/tez/blob/85242ae0/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 a814425..401a606 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
@@ -117,6 +117,7 @@ public class TestHistoryParser {
   private static String TEZ_BASE_DIR =
       "target" + Path.SEPARATOR + TestHistoryParser.class.getName() + "-tez";
   private static String DOWNLOAD_DIR = TEST_ROOT_DIR + Path.SEPARATOR + 
"download";
+  private static String yarnTimelineAddress;
 
   @BeforeClass
   public static void setupCluster() throws Exception {
@@ -176,10 +177,12 @@ public class TestHistoryParser {
 
     TezConfiguration tezConf = new 
TezConfiguration(miniTezCluster.getConfig());
     tezConf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
-    tezConf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, 
"0.0.0.0:8188");
+    tezConf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+        
miniTezCluster.getConfig().get(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS));
     
tezConf.setBoolean(TezConfiguration.TEZ_AM_ALLOW_DISABLED_TIMELINE_DOMAINS, 
true);
     tezConf.set(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS,
         ATSHistoryLoggingService.class.getName());
+    yarnTimelineAddress = 
miniTezCluster.getConfig().get(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS);
 
   }
 
@@ -198,7 +201,7 @@ public class TestHistoryParser {
         WordCount.SumProcessor.class.getName(), "WordCount", true);
 
     //Export the data from ATS
-    String[] args = { "--dagId=" + dagId, "--downloadDir=" + DOWNLOAD_DIR };
+    String[] args = { "--dagId=" + dagId, "--downloadDir=" + DOWNLOAD_DIR, 
"--yarnTimelineAddress=" + yarnTimelineAddress };
 
     int result = ATSImportTool.process(args);
     assertTrue(result == 0);
@@ -363,7 +366,7 @@ public class TestHistoryParser {
         .getName(), "WordCount-With-Exception", true);
 
     //Export the data from ATS
-    String[] args = { "--dagId=" + dagId, "--downloadDir=" + DOWNLOAD_DIR };
+    String[] args = { "--dagId=" + dagId, "--downloadDir=" + DOWNLOAD_DIR, 
"--yarnTimelineAddress=" + yarnTimelineAddress };
 
     int result = ATSImportTool.process(args);
     assertTrue(result == 0);
@@ -611,7 +614,6 @@ public class TestHistoryParser {
     TezConfiguration tezConf = new 
TezConfiguration(miniTezCluster.getConfig());
     if (withTimeline) {
       tezConf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, 
withTimeline);
-      tezConf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, 
"0.0.0.0:8188");
       tezConf.set(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS,
           ATSHistoryLoggingService.class.getName());
     } else {