You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/03/27 01:57:24 UTC
[06/52] [abbrv] tez git commit: TEZ-2168. Fix application
dependencies on mutually exclusive artifacts: tez-yarn-timeline-history and
tez-yarn-timeline-history-with-acls. (hitesh)
TEZ-2168. Fix application dependencies on mutually exclusive artifacts: tez-yarn-timeline-history and tez-yarn-timeline-history-with-acls. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/59529aba
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/59529aba
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/59529aba
Branch: refs/heads/TEZ-2003
Commit: 59529aba8576648ff16c7a26bd64d388e6436a90
Parents: 6692c51
Author: Hitesh Shah <hi...@apache.org>
Authored: Tue Mar 10 21:38:32 2015 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Tue Mar 10 21:38:32 2015 -0700
----------------------------------------------------------------------
pom.xml | 11 +++
tez-plugins/pom.xml | 1 +
.../tez-yarn-timeline-history-with-acls/pom.xml | 10 +++
.../ats/TestATSHistoryWithMiniCluster.java | 70 +-------------------
4 files changed, 23 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/59529aba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3396587..c9a9ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,17 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
http://git-wip-us.apache.org/repos/asf/tez/blob/59529aba/tez-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/tez-plugins/pom.xml b/tez-plugins/pom.xml
index fea261e..1080f2f 100644
--- a/tez-plugins/pom.xml
+++ b/tez-plugins/pom.xml
@@ -44,6 +44,7 @@
</property>
</activation>
<modules>
+ <module>tez-yarn-timeline-history</module>
<module>tez-yarn-timeline-history-with-acls</module>
</modules>
</profile>
http://git-wip-us.apache.org/repos/asf/tez/blob/59529aba/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml b/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
index 54ba479..90c425e 100644
--- a/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
@@ -38,6 +38,16 @@
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
<artifactId>tez-tests</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tez/blob/59529aba/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSHistoryWithMiniCluster.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSHistoryWithMiniCluster.java b/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSHistoryWithMiniCluster.java
index 9c4f721..45bbcc7 100644
--- a/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSHistoryWithMiniCluster.java
+++ b/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSHistoryWithMiniCluster.java
@@ -131,9 +131,8 @@ public class TestATSHistoryWithMiniCluster {
}
@Test (timeout=50000)
- public void testSimpleAMACls() throws Exception {
+ public void testDisabledACls() throws Exception {
TezClient tezSession = null;
- ApplicationId applicationId;
try {
SleepProcessorConfig spConf = new SleepProcessorConfig(1);
@@ -155,54 +154,6 @@ public class TestATSHistoryWithMiniCluster {
tezSession = TezClient.create("TezSleepProcessor", tezConf, true);
tezSession.start();
- applicationId = tezSession.getAppMasterApplicationId();
-
- DAGClient dagClient = tezSession.submitDAG(dag);
-
- DAGStatus dagStatus = dagClient.getDAGStatus(null);
- while (!dagStatus.isCompleted()) {
- LOG.info("Waiting for job to complete. Sleeping for 500ms." + " Current state: "
- + dagStatus.getState());
- Thread.sleep(500l);
- dagStatus = dagClient.getDAGStatus(null);
- }
- Assert.assertEquals(DAGStatus.State.SUCCEEDED, dagStatus.getState());
- } finally {
- if (tezSession != null) {
- tezSession.stop();
- }
- }
-
-// verifyEntityExistence(applicationId);
- }
-
- @Test (timeout=50000)
- public void testDAGACls() throws Exception {
- TezClient tezSession = null;
- ApplicationId applicationId;
- try {
- SleepProcessorConfig spConf = new SleepProcessorConfig(1);
-
- DAG dag = DAG.create("TezSleepProcessor");
- Vertex vertex = Vertex.create("SleepVertex", ProcessorDescriptor.create(
- SleepProcessor.class.getName()).setUserPayload(spConf.toUserPayload()), 1,
- Resource.newInstance(256, 1));
- dag.addVertex(vertex);
-
- TezConfiguration tezConf = new TezConfiguration(mrrTezCluster.getConfig());
- tezConf.setBoolean(TezConfiguration.TEZ_AM_ALLOW_DISABLED_TIMELINE_DOMAINS, true);
- tezConf.set(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS,
- ATSHistoryLoggingService.class.getName());
- Path remoteStagingDir = remoteFs.makeQualified(new Path("/tmp", String.valueOf(random
- .nextInt(100000))));
- remoteFs.mkdirs(remoteStagingDir);
- tezConf.set(TezConfiguration.TEZ_AM_STAGING_DIR, remoteStagingDir.toString());
-
- tezSession = TezClient.create("TezSleepProcessor", tezConf, true);
- tezSession.start();
-
- applicationId = tezSession.getAppMasterApplicationId();
-
DAGClient dagClient = tezSession.submitDAG(dag);
DAGStatus dagStatus = dagClient.getDAGStatus(null);
@@ -218,25 +169,6 @@ public class TestATSHistoryWithMiniCluster {
tezSession.stop();
}
}
-// verifyEntityExistence(applicationId);
}
- private void verifyEntityExistence(ApplicationId applicationId) {
- Assert.assertNotNull(timelineAddress);
-
- String appUrl = "http://" + timelineAddress + "/ws/v1/timeline/TEZ_APPLICATION/"
- + "tez_" + applicationId.toString() + "?fields=otherinfo";
- LOG.info("Getting timeline entity for tez application: " + appUrl);
- TimelineEntity appEntity = getTimelineData(appUrl, TimelineEntity.class);
- Assert.assertNotNull(appEntity);
-
- TezDAGID tezDAGID = TezDAGID.getInstance(applicationId, 1);
- String dagUrl = "http://" + timelineAddress + "/ws/v1/timeline/TEZ_DAG_ID/"
- + tezDAGID.toString() + "?fields=otherinfo";
- LOG.info("Getting timeline entity for tez dag: " + dagUrl);
- TimelineEntity dagEntity = getTimelineData(dagUrl, TimelineEntity.class);
- Assert.assertNotNull(dagEntity);
- }
-
-
}