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 2014/08/15 08:33:38 UTC
git commit: TEZ-1432. TEZ_AM_CANCEL_DELEGATION_TOKEN is named
inorrectly. (sseth)
Repository: tez
Updated Branches:
refs/heads/master 8daccdb09 -> 6023b51df
TEZ-1432. TEZ_AM_CANCEL_DELEGATION_TOKEN is named inorrectly. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6023b51d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6023b51d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6023b51d
Branch: refs/heads/master
Commit: 6023b51df8884280640dff11444d3251beddf04a
Parents: 8daccdb
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu Aug 14 23:33:16 2014 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu Aug 14 23:33:16 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/main/java/org/apache/tez/client/TezClientUtils.java | 4 ++--
.../src/main/java/org/apache/tez/dag/api/TezConfiguration.java | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/6023b51d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c63c985..41ba472 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -60,6 +60,7 @@ INCOMPATIBLE CHANGES
TEZ-1416. tez-api project javadoc/annotations review and clean up
TEZ-1425. Move constants to TezConstants
TEZ-1388. mvn site is slow and generates errors
+ TEZ-1432. Rename property to cancel delegation tokens on app completion (tez.am.am.complete.cancel.delegation.tokens)
Release 0.4.0-incubating: 2014-04-05
http://git-wip-us.apache.org/repos/asf/tez/blob/6023b51d/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
index 0362c05..df066de 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java
@@ -654,8 +654,8 @@ public class TezClientUtils {
}
appContext.setApplicationName(amName);
appContext.setCancelTokensWhenComplete(amConfig.getTezConfiguration().getBoolean(
- TezConfiguration.TEZ_AM_CANCEL_DELEGATION_TOKEN,
- TezConfiguration.TEZ_AM_CANCEL_DELEGATION_TOKEN_DEFAULT));
+ TezConfiguration.TEZ_CANCEL_DELEGATION_TOKENS_ON_COMPLETION,
+ TezConfiguration.TEZ_CANCEL_DELEGATION_TOKENS_ON_COMPLETION_DEFAULT));
appContext.setAMContainerSpec(amContainer);
appContext.setMaxAppAttempts(
http://git-wip-us.apache.org/repos/asf/tez/blob/6023b51d/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index 4f22eb5..68bf841 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -125,9 +125,9 @@ public class TezConfiguration extends Configuration {
public static final String TEZ_TASK_LAUNCH_ENV_DEFAULT = "";
@Private
- public static final String TEZ_AM_CANCEL_DELEGATION_TOKEN = TEZ_AM_PREFIX +
- "am.complete.cancel.delegation.tokens";
- public static final boolean TEZ_AM_CANCEL_DELEGATION_TOKEN_DEFAULT = true;
+ public static final String TEZ_CANCEL_DELEGATION_TOKENS_ON_COMPLETION = TEZ_PREFIX +
+ "cancel.delegation.tokens.on.completion";
+ public static final boolean TEZ_CANCEL_DELEGATION_TOKENS_ON_COMPLETION_DEFAULT = true;
public static final String TEZ_AM_TASK_LISTENER_THREAD_COUNT =
TEZ_AM_PREFIX + "task.listener.thread-count";