Repository: tez Updated Branches: refs/heads/branch-0.7 7041fa795 -> 7ea86c073
TEZ-3037. History URL should be set regardless of which history logging service is enabled. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/7ea86c07 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/7ea86c07 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/7ea86c07 Branch: refs/heads/branch-0.7 Commit: 7ea86c073fddfbdd09d5717829d0c9b9d7a4c532 Parents: 7041fa7 Author: Hitesh Shah <[email protected]> Authored: Thu Jan 14 14:15:42 2016 -0800 Committer: Hitesh Shah <[email protected]> Committed: Thu Jan 14 14:15:42 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/tez/dag/app/rm/TaskSchedulerEventHandler.java | 4 +--- .../tez/dag/app/rm/TestTaskSchedulerEventHandler.java | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/7ea86c07/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1fe7627..cc426b7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES TEZ-2972. Avoid task rescheduling when a node turns unhealthy ALL CHANGES + TEZ-3037. History URL should be set regardless of which history logging service is enabled. TEZ-3032. DAG start time getting logged using system time instead of recorded time in startTime field. TEZ-2129. Task and Attempt views should contain links to the logs TEZ-3025. InputInitializer creation should use the dag ugi. http://git-wip-us.apache.org/repos/asf/tez/blob/7ea86c07/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java index ccb4e56..bd01fab 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java @@ -600,14 +600,12 @@ public class TaskSchedulerEventHandler extends AbstractService Configuration config = this.appContext.getAMConf(); String historyUrl = ""; - String loggingClass = config.get(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS, ""); String historyUrlTemplate = config.get(TezConfiguration.TEZ_AM_TEZ_UI_HISTORY_URL_TEMPLATE, TezConfiguration.TEZ_AM_TEZ_UI_HISTORY_URL_TEMPLATE_DEFAULT); String historyUrlBase = config.get(TezConfiguration.TEZ_HISTORY_URL_BASE, ""); - if (loggingClass.equals("org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService") && - !historyUrlTemplate.isEmpty() && + if (!historyUrlTemplate.isEmpty() && !historyUrlBase.isEmpty()) { // replace the placeholders, while tolerating extra or missing "/" in input. replace all // instances of consecutive "/" with single (except for the http(s):// case http://git-wip-us.apache.org/repos/asf/tez/blob/7ea86c07/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskSchedulerEventHandler.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskSchedulerEventHandler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskSchedulerEventHandler.java index d274f8c..5206025 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskSchedulerEventHandler.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskSchedulerEventHandler.java @@ -340,17 +340,14 @@ public class TestTaskSchedulerEventHandler { @Test (timeout = 5000) public void testHistoryUrlConf() throws Exception { Configuration conf = schedulerHandler.appContext.getAMConf(); + final ApplicationId mockApplicationId = mock(ApplicationId.class); + doReturn("TEST_APP_ID").when(mockApplicationId).toString(); + doReturn(mockApplicationId).when(mockAppContext).getApplicationID(); // ensure history url is empty when timeline server is not the logging class conf.set(TezConfiguration.TEZ_HISTORY_URL_BASE, "http://ui-host:9999";); - assertTrue("".equals(schedulerHandler.getHistoryUrl())); // ensure expansion of url happens - conf.set(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS, - "org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService"); - final ApplicationId mockApplicationId = mock(ApplicationId.class); - doReturn("TEST_APP_ID").when(mockApplicationId).toString(); - doReturn(mockApplicationId).when(mockAppContext).getApplicationID(); assertTrue("http://ui-host:9999/#/tez-app/TEST_APP_ID"; .equals(schedulerHandler.getHistoryUrl()));
