From f603b9cccad50751b84a9f69929f8de5eec2e4d2 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 10 Apr 2015 20:21:00 +0900 Subject: [PATCH] MAPREDUCE-6307. Remove property mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by J.Andreina. (cherry picked from commit 83979e61a49daa67a05eed1ba64c24d31a41610a) Conflicts: hadoop-mapreduce-project/CHANGES.txt --- .../hadoop-common/src/site/markdown/DeprecatedProperties.md | 1 - hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../apache/hadoop/mapreduce/server/tasktracker/TTConfig.java | 2 -- .../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(-) 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 dae99281b4e..e9b82adc377 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 | diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f0538c57140..78ea4ca9490 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -48,6 +48,10 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-5762. Port MAPREDUCE-3223 (Remove MRv1 config from mapred-default.xml) to branch-2. (aajisaka) + MAPREDUCE-6307. Remove property + mapreduce.tasktracker.taskmemorymanager.monitoringinterval. + (J.Andreina via aajisaka) + OPTIMIZATIONS BUG FIXES 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 d9bd67d7c65..5556287dfb4 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 = 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 bbbf99c4beb..66b630a69f3 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 @@ -164,9 +164,6 @@ private static void addDeprecatedKeys() { TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN), 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), 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 191aae8cbee..8ad5ee5e90b 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 @@ mapreduce.job.outputformat.classorg.apache.hadoop.mapreduce.lib.output.NullOutputFormat yarn.log.server.urlhttp://localhost:19888/jobhistory/nmlogs hadoop.http.authentication.kerberos.principalHTTP/localhost@LOCALHOST -mapreduce.tasktracker.taskmemorymanager.monitoringinterval5000 s3native.blocksize67108864 dfs.namenode.edits.dir${dfs.namenode.name.dir} mapreduce.job.map.classorg.apache.hadoop.mapreduce.SleepJob$SleepMapper 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 70ff8af5153..f54c26fa4f2 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}",