tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2557. Port TEZ-1910 to branch-0.5. (hitesh)
Date Fri, 19 Jun 2015 23:24:03 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 6045f02d7 -> 5d0211a38


TEZ-2557. Port TEZ-1910 to branch-0.5. (hitesh)


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

Branch: refs/heads/branch-0.5
Commit: 5d0211a381d305b927c956be886b97a274187b20
Parents: 6045f02d
Author: Hitesh Shah <hitesh@apache.org>
Authored: Fri Jun 19 16:23:44 2015 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Fri Jun 19 16:23:44 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 pom.xml                                               |  1 +
 .../org/apache/tez/client/TestTezClientUtils.java     |  3 +--
 .../apache/tez/dag/api/client/TestATSHttpClient.java  | 14 +++++++++++++-
 .../logging/impl/TestHistoryEventJsonConversion.java  |  1 -
 5 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/5d0211a3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6119ab2..1ba12d0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2557. Port TEZ-1910 to branch-0.5.
   TEZ-2566. Allow TaskAttemptFinishedEvent without TaskAttemptStartedEvent when it is KILLED/FAILED
   TEZ-2475. Fix a potential hang in Tez local mode caused by incorrectly handled interrupts.
   TEZ-2548. TezClient submitDAG can hang if the AM is in the process of shutting down.

http://git-wip-us.apache.org/repos/asf/tez/blob/5d0211a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 24192ec..c0ff82d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -698,6 +698,7 @@
             </environmentVariables>
             <systemPropertyVariables>
               <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+              <tez.hadoop.version>${hadoop.version}</tez.hadoop.version>
             </systemPropertyVariables>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/tez/blob/5d0211a3/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
index 94d52ed..07d037c 100644
--- a/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
+++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClientUtils.java
@@ -497,8 +497,7 @@ public class TestTezClientUtils {
     Configuration srcConf = new Configuration(false);
 
     Map<String, String> confMap = new HashMap<String, String>();
-    confMap.put("ipc.timeout", "2000");
-    confMap.put("fs.defaultFS", "testfs:///");
+    confMap.put("foo.property", "2000");
     confMap.put("tez.property", "tezProperty");
     confMap.put("yarn.property", "yarnProperty");
 

http://git-wip-us.apache.org/repos/asf/tez/blob/5d0211a3/tez-api/src/test/java/org/apache/tez/dag/api/client/TestATSHttpClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/dag/api/client/TestATSHttpClient.java b/tez-api/src/test/java/org/apache/tez/dag/api/client/TestATSHttpClient.java
index 0e3290f..428f103 100644
--- a/tez-api/src/test/java/org/apache/tez/dag/api/client/TestATSHttpClient.java
+++ b/tez-api/src/test/java/org/apache/tez/dag/api/client/TestATSHttpClient.java
@@ -36,11 +36,23 @@ import org.apache.tez.dag.api.TezException;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
 import org.junit.Test;
 
 public class TestATSHttpClient {
 
-  @Test
+  @Before
+  public void setup() {
+    // Disable tests if hadoop version is less than 2.4.0
+    // as Timeline is not supported in 2.2.x or 2.3.x
+    // If enabled with the lower versions, tests fail due to incompatible use of an API
+    // YarnConfiguration::useHttps which only exists in versions 2.4 and higher
+    String hadoopVersion = System.getProperty("tez.hadoop.version");
+    Assume.assumeFalse(hadoopVersion.startsWith("2.2.") || hadoopVersion.startsWith("2.3."));
+  }
+
+  @Test(timeout = 5000)
   public void testGetDagStatusThrowsExceptionOnEmptyJson() throws TezException {
     ApplicationId mockAppId = mock(ApplicationId.class);
     DAGClientTimelineImpl httpClient = new DAGClientTimelineImpl(mockAppId, "EXAMPLE_DAG_ID",

http://git-wip-us.apache.org/repos/asf/tez/blob/5d0211a3/tez-dag/src/test/java/org/apache/tez/dag/history/logging/impl/TestHistoryEventJsonConversion.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/history/logging/impl/TestHistoryEventJsonConversion.java
b/tez-dag/src/test/java/org/apache/tez/dag/history/logging/impl/TestHistoryEventJsonConversion.java
index 7b30af9..d9e1a38 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/history/logging/impl/TestHistoryEventJsonConversion.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/history/logging/impl/TestHistoryEventJsonConversion.java
@@ -27,7 +27,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.NodeId;
-import org.apache.hadoop.yarn.api.records.timeline.TimelineEvent;
 import org.apache.tez.common.ATSConstants;
 import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.oldrecords.TaskAttemptState;


Mime
View raw message