From f5c8c857beea5b1c0a652f3097c15c06c421fbaa Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 22 Jan 2016 18:35:43 +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 ++++
 .../src/main/resources/mapred-default.xml     | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 373b4bb7396..5eb6984a5f6 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -691,6 +691,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-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 962584c3e36..efbbf534ee6 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
@@ -911,6 +911,18 @@
     </description>
   </property>
 
+  <property>
+    <name>mapreduce.map.skip.proc-count.auto-incr</name>
+    <value>true</value>
+    <description>The flag which if set to true,
+    SkipBadRecords.COUNTER_MAP_PROCESSED_RECORDS is incremented by
+    MapRunner after invoking the map function. This value must be set
+    to false for applications which process the records asynchronously
+    or buffer the input records. For example streaming. In such cases
+    applications should increment this counter on their own.
+    </description>
+  </property>
+
   <property>
     <name>mapreduce.reduce.skip.maxgroups</name>
     <value>0</value>
@@ -926,6 +938,18 @@
     </description>
   </property>
 
+  <property>
+    <name>mapreduce.reduce.skip.proc-count.auto-incr</name>
+    <value>true</value>
+    <description>The flag which if set to true.
+    SkipBadRecords.COUNTER_REDUCE_PROCESSED_GROUPS is incremented by framework
+    after invoking the reduce function. This value must be set to false for
+    applications which process the records asynchronously or buffer the input
+    records. For example streaming. In such cases applications should increment
+    this counter on their own.
+    </description>
+  </property>
+
   <property>
     <name>mapreduce.ifile.readahead</name>
     <value>true</value>