tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject [2/2] tez git commit: TEZ-3305. TestAnalyzer fails on Hadoop 2.7. (Jonathan Eagles via hitesh)
Date Thu, 16 Jun 2016 23:12:03 GMT
TEZ-3305. TestAnalyzer fails on Hadoop 2.7. (Jonathan Eagles via hitesh)

(cherry picked from commit 993a7b5f58223f811d82f2a1dec5ed7349922b2e)

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/daf73692
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/daf73692
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/daf73692

Branch: refs/heads/branch-0.8
Commit: daf73692981951af6142b279f908b16e7e0dc2f2
Parents: 85242ae
Author: Hitesh Shah <hitesh@apache.org>
Authored: Thu Jun 16 16:07:47 2016 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Thu Jun 16 16:11:44 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                   | 2 ++
 .../src/test/java/org/apache/tez/analyzer/TestAnalyzer.java   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/daf73692/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bb0d29f..d30d962 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3305. TestAnalyzer fails on Hadoop 2.7.
   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.
@@ -466,6 +467,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3305. TestAnalyzer fails on Hadoop 2.7.
   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.

http://git-wip-us.apache.org/repos/asf/tez/blob/daf73692/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 f680f59..d34f9c5 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
@@ -88,6 +88,7 @@ public class TestAnalyzer {
   
   private boolean usingATS = true;
   private boolean downloadedSimpleHistoryFile = false;
+  private static String yarnTimelineAddress;
 
   @BeforeClass
   public static void setupClass() throws Exception {
@@ -137,6 +138,7 @@ public class TestAnalyzer {
 
     miniTezCluster.init(conf);
     miniTezCluster.start();
+    yarnTimelineAddress = miniTezCluster.getConfig().get(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS);
   }
 
   private TezConfiguration createCommonTezLog() throws Exception {
@@ -156,7 +158,8 @@ public class TestAnalyzer {
   private void createTezSessionATS() throws Exception {
     TezConfiguration tezConf = createCommonTezLog();
     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());
@@ -255,7 +258,7 @@ public class TestAnalyzer {
     DagInfo dagInfo = null;
     if (usingATS) {
       //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);


Mime
View raw message