You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/04/10 13:25:22 UTC
hadoop git commit: MAPREDUCE-6307. Remove property
mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by
J.Andreina.
Repository: hadoop
Updated Branches:
refs/heads/trunk c91b2de68 -> 83979e61a
MAPREDUCE-6307. Remove property mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by J.Andreina.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/83979e61
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83979e61
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83979e61
Branch: refs/heads/trunk
Commit: 83979e61a49daa67a05eed1ba64c24d31a41610a
Parents: c91b2de
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Apr 10 20:21:00 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Apr 10 20:21:00 2015 +0900
----------------------------------------------------------------------
.../hadoop-common/src/site/markdown/DeprecatedProperties.md | 1 -
hadoop-mapreduce-project/CHANGES.txt | 4 ++++
.../org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java | 2 --
.../main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java | 3 ---
.../src/test/resources/job_1329348432655_0001_conf.xml | 1 -
hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json | 2 --
6 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md b/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md
index dae9928..e9b82ad 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md
@@ -239,7 +239,6 @@ The following table lists the configuration property names that are deprecated i
| mapred.tasktracker.reduce.tasks.maximum | mapreduce.tasktracker.reduce.tasks.maximum |
| mapred.task.tracker.report.address | mapreduce.tasktracker.report.address |
| mapred.task.tracker.task-controller | mapreduce.tasktracker.taskcontroller |
-| mapred.tasktracker.taskmemorymanager.monitoring-interval | mapreduce.tasktracker.taskmemorymanager.monitoringinterval |
| mapred.tasktracker.tasks.sleeptime-before-sigkill | mapreduce.tasktracker.tasks.sleeptimebeforesigkill |
| mapred.temp.dir | mapreduce.cluster.temp.dir |
| mapred.text.key.comparator.options | mapreduce.partition.keycomparator.options |
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 665cb63..a0854c1 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -293,6 +293,10 @@ Release 2.8.0 - UNRELEASED
CompletedJob#loadFullHistoryData for code optimization.
(zxu via rkanter)
+ MAPREDUCE-6307. Remove property
+ mapreduce.tasktracker.taskmemorymanager.monitoringinterval.
+ (J.Andreina via aajisaka)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
index d9bd67d..5556287 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
@@ -80,8 +80,6 @@ public interface TTConfig extends MRConfig {
"mapreduce.tasktracker.resourcecalculatorplugin";
public static final String TT_REDUCE_SLOTS =
"mapreduce.tasktracker.reduce.tasks.maximum";
- public static final String TT_MEMORY_MANAGER_MONITORING_INTERVAL =
- "mapreduce.tasktracker.taskmemorymanager.monitoringinterval";
public static final String TT_LOCAL_CACHE_SIZE =
"mapreduce.tasktracker.cache.local.size";
public static final String TT_LOCAL_CACHE_SUBDIRS_LIMIT =
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
index bbbf99c..66b630a 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
@@ -165,9 +165,6 @@ public class ConfigUtil {
new DeprecationDelta("mapred.tasktracker.reduce.tasks.maximum",
TTConfig.TT_REDUCE_SLOTS),
new DeprecationDelta(
- "mapred.tasktracker.taskmemorymanager.monitoring-interval",
- TTConfig.TT_MEMORY_MANAGER_MONITORING_INTERVAL),
- new DeprecationDelta(
"mapred.tasktracker.tasks.sleeptime-before-sigkill",
TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL),
new DeprecationDelta("slave.host.name",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
index 608b8ab..6d1c175 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
@@ -45,7 +45,6 @@
<property><!--Loaded from job.xml--><name>mapreduce.job.outputformat.class</name><value>org.apache.hadoop.mapreduce.lib.output.NullOutputFormat</value></property>
<property><!--Loaded from job.xml--><name>yarn.log.server.url</name><value>http://localhost:19888/jobhistory/nmlogs</value></property>
<property><!--Loaded from job.xml--><name>hadoop.http.authentication.kerberos.principal</name><value>HTTP/localhost@LOCALHOST</value></property>
-<property><!--Loaded from job.xml--><name>mapreduce.tasktracker.taskmemorymanager.monitoringinterval</name><value>5000</value></property>
<property><!--Loaded from job.xml--><name>s3native.blocksize</name><value>67108864</value></property>
<property><!--Loaded from job.xml--><name>dfs.namenode.edits.dir</name><value>${dfs.namenode.name.dir}</value></property>
<property><!--Loaded from job.xml--><name>mapreduce.job.map.class</name><value>org.apache.hadoop.mapreduce.SleepJob$SleepMapper</value></property>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/83979e61/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
index 70ff8af..f54c26f 100644
--- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
+++ b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
@@ -4580,7 +4580,6 @@
"mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
"hadoop.jetty.logs.serve.aliases" : "true",
"hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST",
- "mapreduce.tasktracker.taskmemorymanager.monitoringinterval" : "5000",
"mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
"s3native.blocksize" : "67108864",
"dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",
@@ -9690,7 +9689,6 @@
"mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
"hadoop.jetty.logs.serve.aliases" : "true",
"hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST",
- "mapreduce.tasktracker.taskmemorymanager.monitoringinterval" : "5000",
"mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
"s3native.blocksize" : "67108864",
"dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",