From 7f215ffdd5219fc585ec484073b317a940895a60 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 22 Jan 2016 18:37:17 +0900 Subject: [PATCH] MAPREDUCE-6605. Fix typos mapreduce.map.skip.proc.count.autoincr and mapreduce.reduce.skip.proc.count.autoincr in mapred-default.xml. Contributed by Kai Sasaki. --- hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../hadoop/mapreduce/TestMapreduceConfigFields.java | 4 ++-- .../src/main/resources/mapred-default.xml | 4 ++-- .../src/test/resources/job_1329348432655_0001_conf.xml | 4 ++-- .../hadoop-sls/src/main/data/2jobs2min-rumen-jh.json | 8 ++++---- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 64711310bc7..ce44cc0d592 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -399,6 +399,10 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. (Kai Sasaki via aajisaka) + MAPREDUCE-6605. Fix typos mapreduce.map.skip.proc.count.autoincr and + mapreduce.reduce.skip.proc.count.autoincr in mapred-default.xml. + (Kai Sasaki via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java index ea3c3ca2fbc..171b5e07917 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java @@ -75,8 +75,8 @@ public class TestMapreduceConfigFields extends TestConfigurationFieldsBase { // Obsolete entries listed in MAPREDUCE-6057 were removed from trunk // but not removed from branch-2. xmlPropsToSkipCompare.add("map.sort.class"); - xmlPropsToSkipCompare.add("mapreduce.reduce.skip.proc.count.autoincr"); - xmlPropsToSkipCompare.add("mapreduce.map.skip.proc.count.autoincr"); + xmlPropsToSkipCompare.add("mapreduce.reduce.skip.proc-count.auto-incr"); + xmlPropsToSkipCompare.add("mapreduce.map.skip.proc-count.auto-incr"); xmlPropsToSkipCompare.add("mapreduce.local.clientfactory.class.name"); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 1e150a985e2..02c459c9f9b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -884,7 +884,7 @@ - mapreduce.map.skip.proc.count.autoincr + mapreduce.map.skip.proc-count.auto-incr true The flag which if set to true, SkipBadRecords.COUNTER_MAP_PROCESSED_RECORDS is incremented @@ -896,7 +896,7 @@ - mapreduce.reduce.skip.proc.count.autoincr + mapreduce.reduce.skip.proc-count.auto-incr true The flag which if set to true, SkipBadRecords.COUNTER_REDUCE_PROCESSED_GROUPS is incremented 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 8ad5ee5e90b..9d4d3602063 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 @@ -93,7 +93,7 @@ mapreduce.reduce.input.buffer.percent0.0 mapreduce.map.output.compress.codecorg.apache.hadoop.io.compress.DefaultCodec yarn.resourcemanager.delegation-token.keepalive-time-ms300000 -mapreduce.map.skip.proc.count.autoincrtrue +mapreduce.map.skip.proc-count.auto-incrtrue dfs.datanode.directoryscan.threads1 mapreduce.jobtracker.addresslocal mapreduce.cluster.local.dir${hadoop.tmp.dir}/mapred/local @@ -198,7 +198,7 @@ dfs.block.access.key.update.interval600 mapreduce.jobhistory.move.interval-ms30000 dfs.datanode.dns.interfacedefault -mapreduce.reduce.skip.proc.count.autoincrtrue +mapreduce.reduce.skip.proc-count.auto-incrtrue dfs.namenode.backup.http-address0.0.0.0:50105 yarn.nodemanager.container-monitor.interval-ms3000 mapred.reducer.new-apitrue 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 f54c26fa4f2..5c2c70d41cb 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 @@ -4645,7 +4645,7 @@ "dfs.ha.log-roll.period" : "120", "mapreduce.reduce.input.buffer.percent" : "0.0", "mapreduce.map.output.compress.codec" : "org.apache.hadoop.io.compress.SnappyCodec", - "mapreduce.map.skip.proc.count.autoincr" : "true", + "mapreduce.map.skip.proc-count.auto-incr" : "true", "dfs.client.failover.sleep.base.millis" : "500", "dfs.datanode.directoryscan.threads" : "1", "mapreduce.jobtracker.address" : "neededForHive:999999", @@ -4765,7 +4765,7 @@ "dfs.namenode.backup.address" : "0.0.0.0:50100", "hadoop.util.hash.type" : "murmur", "dfs.block.access.key.update.interval" : "600", - "mapreduce.reduce.skip.proc.count.autoincr" : "true", + "mapreduce.reduce.skip.proc-count.auto-incr" : "true", "dfs.datanode.dns.interface" : "default", "dfs.datanode.use.datanode.hostname" : "false", "mapreduce.job.output.key.class" : "org.apache.hadoop.io.Text", @@ -9754,7 +9754,7 @@ "dfs.ha.log-roll.period" : "120", "mapreduce.reduce.input.buffer.percent" : "0.0", "mapreduce.map.output.compress.codec" : "org.apache.hadoop.io.compress.SnappyCodec", - "mapreduce.map.skip.proc.count.autoincr" : "true", + "mapreduce.map.skip.proc-count.auto-incr" : "true", "dfs.client.failover.sleep.base.millis" : "500", "dfs.datanode.directoryscan.threads" : "1", "mapreduce.jobtracker.address" : "neededForHive:999999", @@ -9874,7 +9874,7 @@ "dfs.namenode.backup.address" : "0.0.0.0:50100", "hadoop.util.hash.type" : "murmur", "dfs.block.access.key.update.interval" : "600", - "mapreduce.reduce.skip.proc.count.autoincr" : "true", + "mapreduce.reduce.skip.proc-count.auto-incr" : "true", "dfs.datanode.dns.interface" : "default", "dfs.datanode.use.datanode.hostname" : "false", "mapreduce.job.output.key.class" : "org.apache.hadoop.io.Text",