TEZ-3564. TezConfiguration#TEZ_DELETION_TRACKER_CLASS has the wrong config key-name (Kuhu Shukla via jeagles)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/f0683fa5 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f0683fa5 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f0683fa5 Branch: refs/heads/master Commit: f0683fa5ae00f0d4a100c8cdc41c64c68184fe33 Parents: 1136629 Author: Jonathan Eagles <[email protected]> Authored: Fri Dec 16 14:20:15 2016 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Fri Dec 16 14:20:15 2016 -0600 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../src/main/java/org/apache/tez/dag/api/TezConfiguration.java | 6 +++--- .../apache/tez/dag/app/launcher/LocalContainerLauncher.java | 4 ++-- .../apache/tez/dag/app/launcher/TezContainerLauncherImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/f0683fa5/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 7398916..fd599ad 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3564. TezConfiguration#TEZ_DELETION_TRACKER_CLASS has the wrong config key-name TEZ-3557. TEZ-3362 causes TestContainerLauncherWrapper#testDelegation to fail TEZ-3361. Fetch Multiple Partitions from the Shuffle Handler TEZ-3360. Tez Custom Shuffle Handler Documentation http://git-wip-us.apache.org/repos/asf/tez/blob/f0683fa5/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 32e007b..6c2fcf0 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 @@ -1694,10 +1694,10 @@ public class TezConfiguration extends Configuration { */ @ConfigurationScope(Scope.AM) @ConfigurationProperty - public static final String TEZ_DELETION_TRACKER_CLASS = - TEZ_PREFIX + "history.logging.service.class"; + public static final String TEZ_AM_DELETION_TRACKER_CLASS = + TEZ_AM_PREFIX + "deletion.tracker.class"; - public static final String TEZ_DELETION_TRACKER_CLASS_DEFAULT = + public static final String TEZ_AM_DELETION_TRACKER_CLASS_DEFAULT = "org.apache.tez.dag.app.launcher.DeletionTrackerImpl"; /** http://git-wip-us.apache.org/repos/asf/tez/blob/f0683fa5/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java index b6f725c..a5aea77 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/LocalContainerLauncher.java @@ -166,8 +166,8 @@ public class LocalContainerLauncher extends ContainerLauncher { String tezDefaultComponentName = isLocalMode ? TezConstants.getTezUberServicePluginName() : TezConstants.getTezYarnServicePluginName(); - String deletionTrackerClassName = conf.get(TezConfiguration.TEZ_DELETION_TRACKER_CLASS, - TezConfiguration.TEZ_DELETION_TRACKER_CLASS_DEFAULT); + String deletionTrackerClassName = conf.get(TezConfiguration.TEZ_AM_DELETION_TRACKER_CLASS, + TezConfiguration.TEZ_AM_DELETION_TRACKER_CLASS_DEFAULT); deletionTracker = ReflectionUtils.createClazzInstance( deletionTrackerClassName,new Class[] { Map.class, Configuration.class, String.class}, http://git-wip-us.apache.org/repos/asf/tez/blob/f0683fa5/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java index 3ad3488..058abfe 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java @@ -325,8 +325,8 @@ public class TezContainerLauncherImpl extends ContainerLauncher { }; eventHandlingThread.setName("ContainerLauncher Event Handler"); eventHandlingThread.start(); - String deletionTrackerClassName = conf.get(TezConfiguration.TEZ_DELETION_TRACKER_CLASS, - TezConfiguration.TEZ_DELETION_TRACKER_CLASS_DEFAULT); + String deletionTrackerClassName = conf.get(TezConfiguration.TEZ_AM_DELETION_TRACKER_CLASS, + TezConfiguration.TEZ_AM_DELETION_TRACKER_CLASS_DEFAULT); deletionTracker = ReflectionUtils.createClazzInstance( deletionTrackerClassName,new Class[] { Map.class, Configuration.class, String.class},
