Repository: tez
Updated Branches:
refs/heads/branch-0.6 a03e1c951 -> 0c690e392
TEZ-2380. Disable fall back to reading from timeline if timeline disabled.
(Chang Li via hitesh)
(cherry picked from commit c59c874dc3a6bf41ed341638b482e2df794f5e6c)
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/0c690e39
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0c690e39
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0c690e39
Branch: refs/heads/branch-0.6
Commit: 0c690e39245fd79da51445edd1f292ace9fa6b99
Parents: a03e1c9
Author: Hitesh Shah <[email protected]>
Authored: Wed Apr 29 14:40:51 2015 -0700
Committer: Hitesh Shah <[email protected]>
Committed: Wed Apr 29 14:41:47 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
tez-api/src/main/java/org/apache/tez/client/TezClient.java | 5 ++++-
.../main/java/org/apache/tez/dag/api/client/DAGClientImpl.java | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/0c690e39/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8b8d4f5..842f5fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
ALL CHANGES:
TEZ-2385. branch-0.6 compile failure caused by TEZ-2226.
+ TEZ-2380. Disable fall back to reading from timeline if timeline disabled.
TEZ-2226. Disable writing history to timeline if domain creation fails.
TEZ-2259. Push additional data to Timeline for Recovery for better
consumption in UI.
TEZ-2365. Update tez-ui war's license/notice to reflect OFL license
correctly.
http://git-wip-us.apache.org/repos/asf/tez/blob/0c690e39/tez-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClient.java
b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
index 8fc4251..62f9e3b 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -414,6 +414,7 @@ public class TezClient {
}
}
+ TezConfiguration dagClientConf = new
TezConfiguration(amConfig.getTezConfiguration());
Map<String, String> aclConfigs = null;
// TEZ_AM_HISTORY_LOGGING_ENABLED is a config setting enable/disable
logging of all dags within a session
boolean sessionHistoryLoggingEnabled =
amConfig.getTezConfiguration().getBoolean(
@@ -427,9 +428,11 @@ public class TezClient {
LOG.warn("Disabling history logging for dag " +
dag.getName() + " due to error in setting up history acls " + e);
dag.setConf(TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED, "false");
+
dagClientConf.setBoolean(TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED,
false);
}
} else if (!sessionHistoryLoggingEnabled) {
dag.setConf(TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED, "false");
+
dagClientConf.setBoolean(TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED,
false);
}
Map<String, LocalResource> tezJarResources =
getTezJarResources(sessionCredentials);
@@ -477,7 +480,7 @@ public class TezClient {
+ ", applicationId=" + sessionAppId
+ ", dagName=" + dag.getName());
return new DAGClientImpl(sessionAppId, dagId,
- amConfig.getTezConfiguration(), frameworkClient);
+ dagClientConf, frameworkClient);
}
/**
http://git-wip-us.apache.org/repos/asf/tez/blob/0c690e39/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
----------------------------------------------------------------------
diff --git
a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
index 87e64cd..2f2dbbb 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGClientImpl.java
@@ -84,7 +84,11 @@ public class DAGClientImpl extends DAGClient {
this.frameworkClient.start();
}
isATSEnabled =
conf.get(TezConfiguration.TEZ_HISTORY_LOGGING_SERVICE_CLASS, "")
-
.equals("org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService");
+
.equals("org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService") &&
+ conf.getBoolean(TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED,
+ TezConfiguration.TEZ_DAG_HISTORY_LOGGING_ENABLED_DEFAULT) &&
+ conf.getBoolean(TezConfiguration.TEZ_AM_HISTORY_LOGGING_ENABLED,
+ TezConfiguration.TEZ_AM_HISTORY_LOGGING_ENABLED_DEFAULT);
if (UserGroupInformation.isSecurityEnabled()){
//TODO: enable ATS integration in kerberos secured cluster - see TEZ-1529
