Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6307. Remove property mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by J.Andreina. 

(cherry picked from commit 83979e61a4)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
This commit is contained in:
Akira Ajisaka 2015-04-10 20:21:00 +09:00
parent b817f0924d
commit f603b9ccca
6 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md
View File

@ -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.tasktracker.reduce.tasks.maximum | mapreduce.tasktracker.reduce.tasks.maximum |
| mapred.task.tracker.report.address | mapreduce.tasktracker.report.address | | mapred.task.tracker.report.address | mapreduce.tasktracker.report.address |
| mapred.task.tracker.task-controller | mapreduce.tasktracker.taskcontroller | | 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.tasktracker.tasks.sleeptime-before-sigkill | mapreduce.tasktracker.tasks.sleeptimebeforesigkill |
| mapred.temp.dir | mapreduce.cluster.temp.dir | | mapred.temp.dir | mapreduce.cluster.temp.dir |
| mapred.text.key.comparator.options | mapreduce.partition.keycomparator.options | | mapred.text.key.comparator.options | mapreduce.partition.keycomparator.options |

4
hadoop-mapreduce-project/CHANGES.txt
View File

@ -48,6 +48,10 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-5762. Port MAPREDUCE-3223 (Remove MRv1 config from MAPREDUCE-5762. Port MAPREDUCE-3223 (Remove MRv1 config from
mapred-default.xml) to branch-2. (aajisaka) mapred-default.xml) to branch-2. (aajisaka)
MAPREDUCE-6307. Remove property
mapreduce.tasktracker.taskmemorymanager.monitoringinterval.
(J.Andreina via aajisaka)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
View File

@ -80,8 +80,6 @@ public interface TTConfig extends MRConfig {
"mapreduce.tasktracker.resourcecalculatorplugin"; "mapreduce.tasktracker.resourcecalculatorplugin";
public static final String TT_REDUCE_SLOTS = public static final String TT_REDUCE_SLOTS =
"mapreduce.tasktracker.reduce.tasks.maximum"; "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 = public static final String TT_LOCAL_CACHE_SIZE =
"mapreduce.tasktracker.cache.local.size"; "mapreduce.tasktracker.cache.local.size";
public static final String TT_LOCAL_CACHE_SUBDIRS_LIMIT = public static final String TT_LOCAL_CACHE_SUBDIRS_LIMIT =

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
View File

@ -164,9 +164,6 @@ private static void addDeprecatedKeys() {
TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN), TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN),
new DeprecationDelta("mapred.tasktracker.reduce.tasks.maximum", new DeprecationDelta("mapred.tasktracker.reduce.tasks.maximum",
TTConfig.TT_REDUCE_SLOTS), TTConfig.TT_REDUCE_SLOTS),
new DeprecationDelta(
"mapred.tasktracker.taskmemorymanager.monitoring-interval",
TTConfig.TT_MEMORY_MANAGER_MONITORING_INTERVAL),
new DeprecationDelta( new DeprecationDelta(
"mapred.tasktracker.tasks.sleeptime-before-sigkill", "mapred.tasktracker.tasks.sleeptime-before-sigkill",
TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL), TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL),

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
View File

@ -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>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>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>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>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>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> <property><!--Loaded from job.xml--><name>mapreduce.job.map.class</name><value>org.apache.hadoop.mapreduce.SleepJob$SleepMapper</value></property>

2
hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
View File

@ -4580,7 +4580,6 @@
"mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat", "mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
"hadoop.jetty.logs.serve.aliases" : "true", "hadoop.jetty.logs.serve.aliases" : "true",
"hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST", "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", "mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
"s3native.blocksize" : "67108864", "s3native.blocksize" : "67108864",
"dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}", "dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",
@ -9690,7 +9689,6 @@
"mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat", "mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
"hadoop.jetty.logs.serve.aliases" : "true", "hadoop.jetty.logs.serve.aliases" : "true",
"hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST", "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", "mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
"s3native.blocksize" : "67108864", "s3native.blocksize" : "67108864",
"dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}", "dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",