svn commit: r1603694 - in /hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hado

2014-06-18 Thread tgraves
Author: tgraves
Date: Thu Jun 19 01:17:43 2014
New Revision: 1603694

URL: http://svn.apache.org/r1603694
Log:
Preparing for release 0.23.11

Modified:
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/CHANGES.txt?rev=1603694&r1=1603693&r2=1603694&view=diff
==
--- hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/CHANGES.txt 
Thu Jun 19 01:17:43 2014
@@ -1,6 +1,6 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.11 - UNRELEASED
+Release 0.23.11 - 2014-06-26
 
   INCOMPATIBLE CHANGES
 

Modified: 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1603694&r1=1603693&r2=1603694&view=diff
==
--- 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Thu Jun 19 01:17:43 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.11
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.11-SNAPSHOT
+  0.23.11
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1603694&r1=1603693&r2=1603694&view=diff
==
--- 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Thu Jun 19 01:17:43 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.11
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.11-SNAPSHOT
+  0.23.11
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1603694&r1=1603693&r2=1603694&view=diff
==
--- 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.11/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Thu Jun 19 01:17:43 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.11
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.11-SNAPSHOT
+  0.23.11
   hadoop-mapre

svn commit: r1603642 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2014-06-18 Thread tgraves
Author: tgraves
Date: Wed Jun 18 21:47:05 2014
New Revision: 1603642

URL: http://svn.apache.org/r1603642
Log:
Preparing for 0.23.12 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1603642&r1=1603641&r2=1603642&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Jun 18 21:47:05 2014
@@ -1,6 +1,18 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.11 - UNRELEASED
+Release 0.23.12 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+Release 0.23.11 - 2014-06-26
 
   INCOMPATIBLE CHANGES
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1603642&r1=1603641&r2=1603642&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Wed Jun 18 21:47:05 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.12-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.11-SNAPSHOT
+  0.23.12-SNAPSHOT
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1603642&r1=1603641&r2=1603642&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Wed Jun 18 21:47:05 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.12-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.11-SNAPSHOT
+  0.23.12-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1603642&r1=1603641&r2=1603642&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Wed Jun 18 21:47:05 2014
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.11-SNAPSHOT
+0.23.12-SNAPSHOT
   
   4.0.0
   o

svn commit: r1547276 - in /hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hado

2013-12-02 Thread tgraves
Author: tgraves
Date: Tue Dec  3 04:11:20 2013
New Revision: 1547276

URL: http://svn.apache.org/r1547276
Log:
Preparing for release 0.23.10

Modified:

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1547276&r1=1547275&r2=1547276&view=diff
==
--- 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Tue Dec  3 04:11:20 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.10
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.10-SNAPSHOT
+  0.23.10
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1547276&r1=1547275&r2=1547276&view=diff
==
--- 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Tue Dec  3 04:11:20 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.10
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.10-SNAPSHOT
+  0.23.10
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1547276&r1=1547275&r2=1547276&view=diff
==
--- 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Tue Dec  3 04:11:20 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.10
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.10-SNAPSHOT
+  0.23.10
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1547276&r1=1547275&r2=1547276&view=diff
==
--- 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/po

svn commit: r1547275 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-12-02 Thread tgraves
Author: tgraves
Date: Tue Dec  3 04:06:37 2013
New Revision: 1547275

URL: http://svn.apache.org/r1547275
Log:
Preparing for 0.23.11 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1547275&r1=1547274&r2=1547275&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Dec  3 04:06:37 2013
@@ -1,5 +1,17 @@
 Hadoop MapReduce Change Log
 
+Release 0.23.11 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.10 - 2013-12-09
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1547275&r1=1547274&r2=1547275&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Tue Dec  3 04:06:37 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.11-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.10-SNAPSHOT
+  0.23.11-SNAPSHOT
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1547275&r1=1547274&r2=1547275&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Tue Dec  3 04:06:37 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.11-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.10-SNAPSHOT
+  0.23.11-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1547275&r1=1547274&r2=1547275&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Tue Dec  3 04:06:37 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.10-SNAPSHOT
+0.23.11-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   

svn commit: r1547273 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-12-02 Thread tgraves
Author: tgraves
Date: Tue Dec  3 04:00:59 2013
New Revision: 1547273

URL: http://svn.apache.org/r1547273
Log:
Preparing for release 0.23.10

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1547273&r1=1547272&r2=1547273&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Dec  3 04:00:59 2013
@@ -1,6 +1,6 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.10 - UNRELEASED
+Release 0.23.10 - 2013-12-09
 
   INCOMPATIBLE CHANGES
 




svn commit: r1524841 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

2013-09-19 Thread tgraves
Author: tgraves
Date: Thu Sep 19 20:58:18 2013
New Revision: 1524841

URL: http://svn.apache.org/r1524841
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1524841&r1=1524840&r2=1524841&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 19 
20:58:18 2013
@@ -190,6 +190,9 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
@@ -1365,6 +1368,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524841&r1=1524840&r2=1524841&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 20:58:18 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();




svn commit: r1524842 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce

2013-09-19 Thread tgraves
Author: tgraves
Date: Thu Sep 19 20:59:47 2013
New Revision: 1524842

URL: http://svn.apache.org/r1524842
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1524842&r1=1524841&r2=1524842&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Thu Sep 19 20:59:47 2013
@@ -11,6 +11,8 @@ Release 2.2.0 - UNRELEASED
   OPTIMIZATIONS
 
   BUG FIXES
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
 
 Release 2.1.1-beta - 2013-09-23
 

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524842&r1=1524841&r2=1524842&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 20:59:47 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();




svn commit: r1524844 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/Typ

2013-09-19 Thread tgraves
Author: tgraves
Date: Thu Sep 19 21:00:52 2013
New Revision: 1524844

URL: http://svn.apache.org/r1524844
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1524844&r1=1524843&r2=1524844&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 21:00:52 2013
@@ -40,6 +40,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524844&r1=1524843&r2=1524844&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 21:00:52 2013
@@ -468,7 +468,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();




svn commit: r1524843 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeCo

2013-09-19 Thread tgraves
Author: tgraves
Date: Thu Sep 19 21:00:40 2013
New Revision: 1524843

URL: http://svn.apache.org/r1524843
Log:
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via 
tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1524843&r1=1524842&r2=1524843&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Sep 19 21:00:40 2013
@@ -53,6 +53,9 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
+
 Release 2.1.1-beta - 2013-09-23
 
   INCOMPATIBLE CHANGES
@@ -1240,6 +1243,9 @@ Release 0.23.10 - UNRELEASED
 
 MAPREDUCE-5475. MRClientService does not verify ACLs properly (jlowe)
 
+MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
+    via tgraves)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1524843&r1=1524842&r2=1524843&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
 Thu Sep 19 21:00:40 2013
@@ -469,7 +469,7 @@ public class TypeConverter {
 QueueInfo toReturn = new QueueInfo(queueInfo.getQueueName(), "Capacity: " +
   queueInfo.getCapacity() * 100 + ", MaximumCapacity: " +
   (queueInfo.getMaximumCapacity() < 0 ? "UNDEFINED" :
-queueInfo.getMaximumCapacity()) + ", CurrentCapacity: " +
+queueInfo.getMaximumCapacity() * 100) + ", CurrentCapacity: " +
   queueInfo.getCurrentCapacity() * 100, 
fromYarn(queueInfo.getQueueState()),
   TypeConverter.fromYarnApps(queueInfo.getApplications(), conf));
 List childQueues = new ArrayList();




svn commit: r1521584 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/part

2013-09-10 Thread tgraves
Author: tgraves
Date: Tue Sep 10 18:53:29 2013
New Revision: 1521584

URL: http://svn.apache.org/r1521584
Log:
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1521584&r1=1521583&r2=1521584&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Sep 10 18:53:29 2013
@@ -119,6 +119,8 @@ Release 2.1.1-beta - UNRELEASED
 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE (Nemon Lou via 
 devaraj)
 
+MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java?rev=1521584&r1=1521583&r2=1521584&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 Tue Sep 10 18:53:29 2013
@@ -317,7 +317,7 @@ public class InputSampler extends C
 final InputFormat inf = 
 ReflectionUtils.newInstance(job.getInputFormatClass(), conf);
 int numPartitions = job.getNumReduceTasks();
-K[] samples = sampler.getSample(inf, job);
+K[] samples = (K[])sampler.getSample(inf, job);
 LOG.info("Using " + samples.length + " samples");
 RawComparator comparator =
   (RawComparator) job.getSortComparator();




svn commit: r1521576 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputS

2013-09-10 Thread tgraves
Author: tgraves
Date: Tue Sep 10 18:31:50 2013
New Revision: 1521576

URL: http://svn.apache.org/r1521576
Log:
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1521576&r1=1521575&r2=1521576&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Sep 10 
18:31:50 2013
@@ -256,6 +256,8 @@ Release 2.1.1-beta - UNRELEASED
 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE (Nemon Lou via 
 devaraj)
 
+MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java?rev=1521576&r1=1521575&r2=1521576&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 Tue Sep 10 18:31:50 2013
@@ -317,7 +317,7 @@ public class InputSampler extends C
 final InputFormat inf = 
 ReflectionUtils.newInstance(job.getInputFormatClass(), conf);
 int numPartitions = job.getNumReduceTasks();
-K[] samples = sampler.getSample(inf, job);
+K[] samples = (K[])sampler.getSample(inf, job);
 LOG.info("Using " + samples.length + " samples");
 RawComparator comparator =
   (RawComparator) job.getSortComparator();




svn commit: r1521590 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/l

2013-09-10 Thread tgraves
Author: tgraves
Date: Tue Sep 10 19:10:19 2013
New Revision: 1521590

URL: http://svn.apache.org/r1521590
Log:
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)

Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1521590&r1=1521589&r2=1521590&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Tue Sep 10 19:10:19 2013
@@ -81,6 +81,8 @@ Release 2.1.1-beta - UNRELEASED
 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE (Nemon Lou via 
 devaraj)
 
+MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java?rev=1521590&r1=1521589&r2=1521590&view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
 Tue Sep 10 19:10:19 2013
@@ -317,7 +317,7 @@ public class InputSampler extends C
 final InputFormat inf = 
 ReflectionUtils.newInstance(job.getInputFormatClass(), conf);
 int numPartitions = job.getNumReduceTasks();
-K[] samples = sampler.getSample(inf, job);
+K[] samples = (K[])sampler.getSample(inf, job);
 LOG.info("Using " + samples.length + " samples");
 RawComparator comparator =
   (RawComparator) job.getSortComparator();




svn commit: r1498480 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

2013-07-01 Thread tgraves
Author: tgraves
Date: Mon Jul  1 14:29:45 2013
New Revision: 1498480

URL: http://svn.apache.org/r1498480
Log:
Preparing for 0.23.9 release

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1498480&r1=1498479&r2=1498480&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Jul  1 
14:29:45 2013
@@ -1175,7 +1175,19 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
-Release 0.23.9 - UNRELEASED
+Release 0.23.10 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES
 




svn commit: r1498478 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-07-01 Thread tgraves
Author: tgraves
Date: Mon Jul  1 14:27:48 2013
New Revision: 1498478

URL: http://svn.apache.org/r1498478
Log:
Preparing for 0.23.9 release

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1498478&r1=1498477&r2=1498478&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon 
Jul  1 14:27:48 2013
@@ -1050,7 +1050,19 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
-Release 0.23.9 - UNRELEASED
+Release 0.23.10 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES
 




svn commit: r1498472 - in /hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2013-07-01 Thread tgraves
Author: tgraves
Date: Mon Jul  1 14:21:59 2013
New Revision: 1498472

URL: http://svn.apache.org/r1498472
Log:
Preparing for release 0.23.9

Modified:

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1498472&r1=1498471&r2=1498472&view=diff
==
--- 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Jul  1 14:21:59 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.9
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.9-SNAPSHOT
+  0.23.9
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1498472&r1=1498471&r2=1498472&view=diff
==
--- 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Mon Jul  1 14:21:59 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.9
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.9-SNAPSHOT
+  0.23.9
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1498472&r1=1498471&r2=1498472&view=diff
==
--- 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Mon Jul  1 14:21:59 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.9
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.9-SNAPSHOT
+  0.23.9
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1498472&r1=1498471&r2=1498472&view=diff
==
--- 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 Mon Jul  1 14:21:59 2013
@@ -

svn commit: r1498464 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-07-01 Thread tgraves
Author: tgraves
Date: Mon Jul  1 14:11:35 2013
New Revision: 1498464

URL: http://svn.apache.org/r1498464
Log:
Preparing for 0.23.10 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1498464&r1=1498463&r2=1498464&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Jul  1 14:11:35 2013
@@ -1,5 +1,17 @@
 Hadoop MapReduce Change Log
 
+Release 0.23.10 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1498464&r1=1498463&r2=1498464&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Jul  1 14:11:35 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.10-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.9-SNAPSHOT
+  0.23.10-SNAPSHOT
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1498464&r1=1498463&r2=1498464&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Mon Jul  1 14:11:35 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.10-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.9-SNAPSHOT
+  0.23.10-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1498464&r1=1498463&r2=1498464&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Mon Jul  1 14:11:35 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.9-SNAPSHOT
+0.23.10-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-cl

svn commit: r1498462 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-07-01 Thread tgraves
Author: tgraves
Date: Mon Jul  1 14:07:28 2013
New Revision: 1498462

URL: http://svn.apache.org/r1498462
Log:
Preparing for release 0.23.9

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1498462&r1=1498461&r2=1498462&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Jul  1 14:07:28 2013
@@ -1,6 +1,6 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.9 - UNRELEASED
+Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES
 




svn commit: r1489909 - /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

2013-06-05 Thread tgraves
Author: tgraves
Date: Wed Jun  5 15:10:26 2013
New Revision: 1489909

URL: http://svn.apache.org/r1489909
Log:
Updating release date for 0.23.8

Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1489909&r1=1489908&r2=1489909&view=diff
==
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Wed Jun  5 15:10:26 2013
@@ -978,7 +978,7 @@ Release 0.23.9 - UNRELEASED
 
   BUG FIXES
 
-Release 0.23.8 - UNRELEASED
+Release 0.23.8 - 2013-06-05
 
   INCOMPATIBLE CHANGES
 
@@ -1002,7 +1002,7 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific
 counters page for failed job. (Ashwin Shankar via jlowe)
 
-Release 0.23.7 - UNRELEASED
+Release 0.23.7 - 2013-04-18
 
   INCOMPATIBLE CHANGES
 
@@ -1071,7 +1071,7 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error
 (Thomas Graves via jlowe)
 
-Release 0.23.6 - UNRELEASED
+Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES
 




svn commit: r1489907 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

2013-06-05 Thread tgraves
Author: tgraves
Date: Wed Jun  5 15:05:43 2013
New Revision: 1489907

URL: http://svn.apache.org/r1489907
Log:
Updating release date for 0.23.8

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1489907&r1=1489906&r2=1489907&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Jun  5 
15:05:43 2013
@@ -1106,7 +1106,7 @@ Release 0.23.9 - UNRELEASED
 
   BUG FIXES
 
-Release 0.23.8 - UNRELEASED
+Release 0.23.8 - 2013-06-05
 
   INCOMPATIBLE CHANGES
 
@@ -1130,7 +1130,7 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific
 counters page for failed job. (Ashwin Shankar via jlowe)
 
-Release 0.23.7 - UNRELEASED
+Release 0.23.7 - 2013-04-18
 
   INCOMPATIBLE CHANGES
 
@@ -1199,7 +1199,7 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error
 (Thomas Graves via jlowe)
 
-Release 0.23.6 - UNRELEASED
+Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES
 




svn commit: r1489902 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-06-05 Thread tgraves
Author: tgraves
Date: Wed Jun  5 15:01:24 2013
New Revision: 1489902

URL: http://svn.apache.org/r1489902
Log:
Updating release date for 0.23.8

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1489902&r1=1489901&r2=1489902&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Jun  5 15:01:24 2013
@@ -1002,7 +1002,7 @@ Release 0.23.9 - UNRELEASED
 
   BUG FIXES
 
-Release 0.23.8 - UNRELEASED
+Release 0.23.8 - 2013-06-05
 
   INCOMPATIBLE CHANGES
 
@@ -1026,7 +1026,7 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific
 counters page for failed job. (Ashwin Shankar via jlowe)
 
-Release 0.23.7 - UNRELEASED
+Release 0.23.7 - 2013-04-18
 
   INCOMPATIBLE CHANGES
 
@@ -1095,7 +1095,7 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error
 (Thomas Graves via jlowe)
 
-Release 0.23.6 - UNRELEASED
+Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES
 




svn commit: r1489897 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-06-05 Thread tgraves
Author: tgraves
Date: Wed Jun  5 14:50:31 2013
New Revision: 1489897

URL: http://svn.apache.org/r1489897
Log:
Updating release date for 0.23.8

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1489897&r1=1489896&r2=1489897&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Jun  5 14:50:31 2013
@@ -15,7 +15,7 @@ Release 0.23.9 - UNRELEASED
 
   BUG FIXES
 
-Release 0.23.8 - UNRELEASED
+Release 0.23.8 - 2013-06-05
 
   INCOMPATIBLE CHANGES
 




svn commit: r1489895 - /hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt

2013-06-05 Thread tgraves
Author: tgraves
Date: Wed Jun  5 14:49:16 2013
New Revision: 1489895

URL: http://svn.apache.org/r1489895
Log:
Updating release date for 0.23.8

Modified:
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt?rev=1489895&r1=1489894&r2=1489895&view=diff
==
--- hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/CHANGES.txt 
Wed Jun  5 14:49:16 2013
@@ -1,6 +1,6 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.8 - UNRELEASED
+Release 0.23.8 - 2013-06-05
 
   INCOMPATIBLE CHANGES
 




svn commit: r1486960 - in /hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2013-05-28 Thread tgraves
Author: tgraves
Date: Tue May 28 15:15:18 2013
New Revision: 1486960

URL: http://svn.apache.org/r1486960
Log:
Preparing for release 0.23.8

Modified:

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1486960&r1=1486959&r2=1486960&view=diff
==
--- 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Tue May 28 15:15:18 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.8
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.8-SNAPSHOT
+  0.23.8
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1486960&r1=1486959&r2=1486960&view=diff
==
--- 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Tue May 28 15:15:18 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.8
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.8-SNAPSHOT
+  0.23.8
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1486960&r1=1486959&r2=1486960&view=diff
==
--- 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Tue May 28 15:15:18 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.8
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.8-SNAPSHOT
+  0.23.8
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1486960&r1=1486959&r2=1486960&view=diff
==
--- 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 Tue May 28 15:15:18 2013
@@ -

svn commit: r1486958 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-05-28 Thread tgraves
Author: tgraves
Date: Tue May 28 15:11:05 2013
New Revision: 1486958

URL: http://svn.apache.org/r1486958
Log:
Preparing for 0.23.9 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1486958&r1=1486957&r2=1486958&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
May 28 15:11:05 2013
@@ -1,5 +1,17 @@
 Hadoop MapReduce Change Log
 
+Release 0.23.9 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.8 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1486958&r1=1486957&r2=1486958&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Tue May 28 15:11:05 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.9-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.8-SNAPSHOT
+  0.23.9-SNAPSHOT
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1486958&r1=1486957&r2=1486958&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Tue May 28 15:11:05 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.9-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.8-SNAPSHOT
+  0.23.9-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1486958&r1=1486957&r2=1486958&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Tue May 28 15:11:05 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPSHOT
+0.23.9-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core

svn commit: r1470038 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

2013-04-19 Thread tgraves
Author: tgraves
Date: Fri Apr 19 20:55:05 2013
New Revision: 1470038

URL: http://svn.apache.org/r1470038
Log:
MAPREDUCE-5147. Maven build should create 
hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1470038&r1=1470037&r2=1470038&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri 
Apr 19 20:55:05 2013
@@ -736,6 +736,10 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
 (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-5147. Maven build should create 
+hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via 
tgraves)
+
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1470038&r1=1470037&r2=1470038&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Fri Apr 19 20:55:05 2013
@@ -76,8 +76,6 @@
   
 
   
-
-mr-app
 
   
 maven-jar-plugin
@@ -90,26 +88,6 @@
   
 
   
-  
-maven-antrun-plugin
-
-  
-create-mr-app-symlinks
-package
-
-  
-
-
-  
-
-
-  run
-
-  
-
-  
 
   
 




svn commit: r1470036 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

2013-04-19 Thread tgraves
Author: tgraves
Date: Fri Apr 19 20:52:39 2013
New Revision: 1470036

URL: http://svn.apache.org/r1470036
Log:
MAPREDUCE-5147. Maven build should create 
hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1470036&r1=1470035&r2=1470036&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Apr 19 20:52:39 2013
@@ -21,6 +21,9 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h.
 (Andy Isaacson via tgraves)
 
+MAPREDUCE-5147. Maven build should create 
+hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via 
tgraves)
+
 Release 0.23.7 - 2013-04-18
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1470036&r1=1470035&r2=1470036&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Fri Apr 19 20:52:39 2013
@@ -76,8 +76,6 @@
   
 
   
-
-mr-app
 
   
 maven-jar-plugin
@@ -95,26 +93,6 @@
   
 
   
-  
-maven-antrun-plugin
-
-  
-create-mr-app-symlinks
-package
-
-  
-
-
-  
-
-
-  run
-
-  
-
-  
 
   
 




svn commit: r1470035 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

2013-04-19 Thread tgraves
Author: tgraves
Date: Fri Apr 19 20:50:48 2013
New Revision: 1470035

URL: http://svn.apache.org/r1470035
Log:
MAPREDUCE-5147. Maven build should create 
hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1470035&r1=1470034&r2=1470035&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Apr 19 
20:50:48 2013
@@ -889,6 +889,9 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
 (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-5147. Maven build should create 
+hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via 
tgraves)
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1470035&r1=1470034&r2=1470035&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Fri Apr 19 20:50:48 2013
@@ -76,8 +76,6 @@
   
 
   
-
-mr-app
 
   
 maven-jar-plugin
@@ -90,26 +88,6 @@
   
 
   
-  
-maven-antrun-plugin
-
-  
-create-mr-app-symlinks
-package
-
-  
-
-
-  
-
-
-  run
-
-  
-
-  
 
   
 




svn commit: r1469560 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-04-18 Thread tgraves
Author: tgraves
Date: Thu Apr 18 20:49:05 2013
New Revision: 1469560

URL: http://svn.apache.org/r1469560
Log:
Updating for 0.23.7 release

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1469560&r1=1469559&r2=1469560&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Apr 18 20:49:05 2013
@@ -21,7 +21,7 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h.
 (Andy Isaacson via tgraves)
 
-Release 0.23.7 - UNRELEASED
+Release 0.23.7 - 2013-04-18
 
   INCOMPATIBLE CHANGES
 




svn commit: r1469340 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-04-18 Thread tgraves
Author: tgraves
Date: Thu Apr 18 14:20:33 2013
New Revision: 1469340

URL: http://svn.apache.org/r1469340
Log:
MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h. (Andy Isaacson via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1469340&r1=1469339&r2=1469340&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Apr 18 14:20:33 2013
@@ -18,6 +18,9 @@ Release 0.23.8 - UNRELEASED
 MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
 (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h.
+(Andy Isaacson via tgraves)
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1469017 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-04-17 Thread tgraves
Author: tgraves
Date: Wed Apr 17 18:13:07 2013
New Revision: 1469017

URL: http://svn.apache.org/r1469017
Log:
Fixing version number typeo from 0.23.8-SNAPHOST to 0.23.8-SNAPSHOT

Modified:

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1469017&r1=1469016&r2=1469017&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Wed Apr 17 18:13:07 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPHOST
+0.23.8-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.8-SNAPHOST
+  0.23.8-SNAPSHOT
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1469017&r1=1469016&r2=1469017&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Wed Apr 17 18:13:07 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPHOST
+0.23.8-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.8-SNAPHOST
+  0.23.8-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1469017&r1=1469016&r2=1469017&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Wed Apr 17 18:13:07 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.8-SNAPHOST
+0.23.8-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.8-SNAPHOST
+  0.23.8-SNAPSHOT
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1469017&r1=1469016&r2=1469017&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/po

svn commit: r1468485 [1/2] - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/ h

2013-04-16 Thread tgraves
Author: tgraves
Date: Tue Apr 16 16:13:02 2013
New Revision: 1468485

URL: http://svn.apache.org/r1468485
Log:
MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/resources/job_1329348432655_0001-10.jhist
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1468485&r1=1468484&r2=1468485&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Apr 16 16:13:02 2013
@@ -12,6 +12,9 @@ Release 0.23.8 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
+(Aleksey Gorshkov via tgraves)
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java?rev=1468485&r1=1468484&r2=1468485&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 Tue Apr 16 16:13:02 2013
@@ -46,6 +46,7 @@ import org.apache.hadoop.mapreduce.TaskT
 import org.apache.hadoop.mapreduce.jobhistory.HistoryViewer;
 import org.apache.hadoop.mapreduce.v2.LogParams;
 import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.util.ExitUtil;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.hadoop.yarn.logaggregation.LogDumper;
@@ -307,6 +308,7 @@ public class CLI extends Configured impl
 exitCode = 0;
   } else if (displayTasks) {
 displayTasks(cluster.getJob(JobID.forName(jobid)), taskType, 
taskState);
+exitCode = 0;
   } else if(killTask) {
 TaskAttemptID taskID = TaskAttemptID.forName(taskid);
 Job job = cluster.getJob(taskID.getJobID());
@@ -603,6 +605,6 @@ public class CLI extends Configured impl
   
   public static void main(String[] argv) throws Exception {
 int res = ToolRunner.run(new CLI(), argv);
-System.exit(res);
+ExitUtil.terminate(res);
   }
 }

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml?rev=1468485&r1=1468484&r2=1468485&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
 Tue Apr 16 16:13:02 2013
@@ -102,6 +102,16 @@
   
 
   
+org.apache.rat
+apache-rat-plugin
+
+  
+src/test/java/org/apache/hadoop/cli/data60bytes
+
src/test/resources/job_1329348432655_0001-10.jhist
+  
+
+  
+  
 maven-jar-plugin
 
   
@@ -132,15 +142,6 @@
   
 
   
-  
-org.apache.rat
-apache-rat-plugin
-
-  
-src/test/java/org/apache/hadoop/cli/data60bytes
-  
-
-  
 
   
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapre

svn commit: r1468484 [1/2] - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/ hado

2013-04-16 Thread tgraves
Author: tgraves
Date: Tue Apr 16 16:12:25 2013
New Revision: 1468484

URL: http://svn.apache.org/r1468484
Log:
MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/resources/job_1329348432655_0001-10.jhist
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1468484&r1=1468483&r2=1468484&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Apr 16 16:12:25 2013
@@ -712,6 +712,9 @@ Release 0.23.8 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
+(Aleksey Gorshkov via tgraves)
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java?rev=1468484&r1=1468483&r2=1468484&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 Tue Apr 16 16:12:25 2013
@@ -47,6 +47,7 @@ import org.apache.hadoop.mapreduce.TaskT
 import org.apache.hadoop.mapreduce.jobhistory.HistoryViewer;
 import org.apache.hadoop.mapreduce.v2.LogParams;
 import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.util.ExitUtil;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.hadoop.yarn.logaggregation.LogDumper;
@@ -310,6 +311,7 @@ public class CLI extends Configured impl
 exitCode = 0;
   } else if (displayTasks) {
 displayTasks(cluster.getJob(JobID.forName(jobid)), taskType, 
taskState);
+exitCode = 0;
   } else if(killTask) {
 TaskAttemptID taskID = TaskAttemptID.forName(taskid);
 Job job = cluster.getJob(taskID.getJobID());
@@ -607,6 +609,6 @@ public class CLI extends Configured impl
   
   public static void main(String[] argv) throws Exception {
 int res = ToolRunner.run(new CLI(), argv);
-System.exit(res);
+ExitUtil.terminate(res);
   }
 }

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml?rev=1468484&r1=1468483&r2=1468484&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
 Tue Apr 16 16:12:25 2013
@@ -118,6 +118,16 @@
   
 
   
+org.apache.rat
+apache-rat-plugin
+
+  
+src/test/java/org/apache/hadoop/cli/data60bytes
+
src/test/resources/job_1329348432655_0001-10.jhist
+  
+
+  
+  
 maven-jar-plugin
 
   
@@ -148,15 +158,6 @@
   
 
   
-  
-org.apache.rat
-apache-rat-plugin
-
-  
-src/test/java/org/apache/hadoop/cli/data60bytes
-  
-
-  
 
   
 

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduc

svn commit: r1468483 [1/2] - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/ hadoop-mapreduce

2013-04-16 Thread tgraves
Author: tgraves
Date: Tue Apr 16 16:11:35 2013
New Revision: 1468483

URL: http://svn.apache.org/r1468483
Log:
MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/resources/job_1329348432655_0001-10.jhist
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1468483&r1=1468482&r2=1468483&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Apr 16 
16:11:35 2013
@@ -861,6 +861,9 @@ Release 0.23.8 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI
+(Aleksey Gorshkov via tgraves)
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java?rev=1468483&r1=1468482&r2=1468483&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
 Tue Apr 16 16:11:35 2013
@@ -50,6 +50,7 @@ import org.apache.hadoop.mapreduce.TaskT
 import org.apache.hadoop.mapreduce.jobhistory.HistoryViewer;
 import org.apache.hadoop.mapreduce.v2.LogParams;
 import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.util.ExitUtil;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.hadoop.yarn.logaggregation.LogDumper;
@@ -64,8 +65,6 @@ import com.google.common.base.Charsets;
 public class CLI extends Configured implements Tool {
   private static final Log LOG = LogFactory.getLog(CLI.class);
   protected Cluster cluster;
-  private final Set taskTypes = new HashSet(
-  Arrays.asList("map", "reduce", "setup", "cleanup"));
   private final Set taskStates = new HashSet(
   Arrays.asList("pending", "running", "completed", "failed", 
"killed"));
 
@@ -317,6 +316,7 @@ public class CLI extends Configured impl
 exitCode = 0;
   } else if (displayTasks) {
 displayTasks(cluster.getJob(JobID.forName(jobid)), taskType, 
taskState);
+exitCode = 0;
   } else if(killTask) {
 TaskAttemptID taskID = TaskAttemptID.forName(taskid);
 Job job = cluster.getJob(taskID.getJobID());
@@ -563,16 +563,18 @@ public class CLI extends Configured impl
*/
   protected void displayTasks(Job job, String type, String state) 
   throws IOException, InterruptedException {
-if (!taskTypes.contains(type)) {
-  throw new IllegalArgumentException("Invalid type: " + type + 
-  ". Valid types for task are: map, reduce, setup, cleanup.");
-}
+
 if (!taskStates.contains(state)) {
   throw new java.lang.IllegalArgumentException("Invalid state: " + state + 
   ". Valid states for task are: pending, running, completed, failed, 
killed.");
 }
-
-TaskReport[] reports = job.getTaskReports(TaskType.valueOf(type));
+TaskReport[] reports=null;
+try{
+  reports = job.getTaskReports(TaskType.valueOf(type));
+}catch(IllegalArgumentException e){
+  throw new IllegalArgumentException("Invalid type: " + type + 
+  ". Valid types for task are: MAP, REDUCE, JOB_SETUP, JOB_CLEANUP, 
TASK_CLEANUP.");
+}
 for (TaskReport report : reports) {
   TIPStatus status = report.getCurrentStatus();
   if ((state.equals("pending") && status ==TIPStatus.PENDING) ||
@@

svn commit: r1467070 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-04-11 Thread tgraves
Author: tgraves
Date: Thu Apr 11 20:09:26 2013
New Revision: 1467070

URL: http://svn.apache.org/r1467070
Log:
Preparing for release 0.23.7

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1467070&r1=1467069&r2=1467070&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Apr 11 20:09:26 2013
@@ -678,6 +678,18 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
+Release 0.23.8 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1467069 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

2013-04-11 Thread tgraves
Author: tgraves
Date: Thu Apr 11 20:08:00 2013
New Revision: 1467069

URL: http://svn.apache.org/r1467069
Log:
Preparing for release 0.23.7

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1467069&r1=1467068&r2=1467069&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Apr 11 
20:08:00 2013
@@ -827,6 +827,18 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
+Release 0.23.8 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1467029 - in /hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2013-04-11 Thread tgraves
Author: tgraves
Date: Thu Apr 11 18:14:44 2013
New Revision: 1467029

URL: http://svn.apache.org/r1467029
Log:
Preparing for release 0.23.7

Modified:

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1467029&r1=1467028&r2=1467029&view=diff
==
--- 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Thu Apr 11 18:14:44 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.7-SNAPSHOT
+0.23.7
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.7-SNAPSHOT
+  0.23.7
   hadoop-mapreduce-client-app
 
   
@@ -105,7 +105,7 @@
   
 
-
   
 

Modified: 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1467029&r1=1467028&r2=1467029&view=diff
==
--- 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Thu Apr 11 18:14:44 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.7-SNAPSHOT
+0.23.7
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.7-SNAPSHOT
+  0.23.7
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1467029&r1=1467028&r2=1467029&view=diff
==
--- 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Thu Apr 11 18:14:44 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.7-SNAPSHOT
+0.23.7
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.7-SNAPSHOT
+  0.23.7
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1467029&r1=1467028&r2=1467029&view=diff
==
--- 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.7/hadoop-mapreduce-project/hadoop-map

svn commit: r1467024 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-04-11 Thread tgraves
Author: tgraves
Date: Thu Apr 11 18:10:42 2013
New Revision: 1467024

URL: http://svn.apache.org/r1467024
Log:
Preparing for 0.23.8 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1467024&r1=1467023&r2=1467024&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Apr 11 18:10:42 2013
@@ -1,5 +1,17 @@
 Hadoop MapReduce Change Log
 
+Release 0.23.8 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.7 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1467024&r1=1467023&r2=1467024&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Thu Apr 11 18:10:42 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.7-SNAPSHOT
+0.23.8-SNAPHOST
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.7-SNAPSHOT
+  0.23.8-SNAPHOST
   hadoop-mapreduce-client-app
 
   
@@ -105,7 +105,7 @@
   
 
-
   
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1467024&r1=1467023&r2=1467024&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Thu Apr 11 18:10:42 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.7-SNAPSHOT
+0.23.8-SNAPHOST
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.7-SNAPSHOT
+  0.23.8-SNAPHOST
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1467024&r1=1467023&r2=1467024&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Thu Apr 11 18:10:42 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0

svn commit: r1465018 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/ hadoop-mapreduce-client/hadoop-mapre

2013-04-05 Thread tgraves
Author: tgraves
Date: Fri Apr  5 15:44:06 2013
New Revision: 1465018

URL: http://svn.apache.org/r1465018
Log:
MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryServer.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/mapred-queues.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1465018&r1=1465017&r2=1465018&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Apr  5 15:44:06 2013
@@ -117,6 +117,9 @@ Release 0.23.7 - UNRELEASED
 
 MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey
+Gorshkov via tgraves)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/mapred-queues.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/mapred-queues.xml?rev=1465018&r1=1465017&r2=1465018&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/mapred-queues.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/mapred-queues.xml
 Fri Apr  5 15:44:06 2013
@@ -1,4 +1,17 @@
 
+
 

svn commit: r1465017 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/ hadoop-mapreduce-client/

2013-04-05 Thread tgraves
Author: tgraves
Date: Fri Apr  5 15:43:53 2013
New Revision: 1465017

URL: http://svn.apache.org/r1465017
Log:
MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryServer.java
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1465017&r1=1465016&r2=1465017&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Apr  5 
15:43:53 2013
@@ -773,6 +773,9 @@ Release 0.23.7 - UNRELEASED
 
 MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey 
+Gorshkov via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java?rev=1465017&r1=1465016&r2=1465017&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
 Fri Apr  5 15:43:53 2013
@@ -869,4 +869,9 @@ public class HistoryFileManager extends 
   }
 }
   }
+  // for test
+  @VisibleForTesting
+  void setMaxHistoryAge(long newValue){
+maxHistoryAge=newValue;
+  } 
 }

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java?rev=1465017&r1=1465016&r2=1465017&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
 Fri Apr  5 15:43:53 2013
@@ -21,46 +21,75 @@ package org.apache.hadoop.mapreduce.v2.h
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
+import org.apache.hadoop.mapreduce.TaskID;
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskAttemptInfo;
 import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo;
+import org.apache.hadoop.mapreduce.v2.api.records.Phase;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskId;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskReport;
 import org.apache.hadoop.mapreduce.v2.hs.CompletedTask;
-import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Mockito;
+import static org.mockito.Mockito.*;
+import static org.junit.Assert.*;
 
 public class TestCompletedTask{
 
-  @Test
+  @Test (timeout=5000)
   public void testTaskStartTimes() {
 
-TaskId taskId = Mockito.mock(TaskId.class); 
-TaskInfo taskInfo = Mockito.mock(TaskInfo.class);
+TaskId taskId = mock(TaskId.cl

svn commit: r1465016 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/ hadoop-mapre

2013-04-05 Thread tgraves
Author: tgraves
Date: Fri Apr  5 15:43:38 2013
New Revision: 1465016

URL: http://svn.apache.org/r1465016
Log:
MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey 
Gorshkov via tgraves)

Added:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryServer.java
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1465016&r1=1465015&r2=1465016&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri 
Apr  5 15:43:38 2013
@@ -717,6 +717,9 @@ Release 0.23.7 - UNRELEASED
 
 MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
 
+MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey
+Gorshkov via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java?rev=1465016&r1=1465015&r2=1465016&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryFileManager.java
 Fri Apr  5 15:43:38 2013
@@ -869,4 +869,8 @@ public class HistoryFileManager extends 
   }
 }
   }
+  @VisibleForTesting
+  protected void setMaxHistoryAge(long newValue){
+maxHistoryAge=newValue;
+  } 
 }

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java?rev=1465016&r1=1465015&r2=1465016&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestCompletedTask.java
 Fri Apr  5 15:43:38 2013
@@ -21,46 +21,75 @@ package org.apache.hadoop.mapreduce.v2.h
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
+import org.apache.hadoop.mapreduce.TaskID;
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskAttemptInfo;
 import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo;
+import org.apache.hadoop.mapreduce.v2.api.records.Phase;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskId;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskReport;
 import org.apache.hadoop.mapreduce.v2.hs.CompletedTask;
-import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Mockito;
+import static org.mockito.Mockito.*;
+import static org.junit.Assert.*;
 
 public class TestCompletedTask{
 
-  @Test
+ 

svn commit: r1463808 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-04-02 Thread tgraves
Author: tgraves
Date: Wed Apr  3 01:47:31 2013
New Revision: 1463808

URL: http://svn.apache.org/r1463808
Log:
MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1463808&r1=1463807&r2=1463808&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Apr  3 01:47:31 2013
@@ -708,6 +708,8 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause
 reducer to fail (Robert Parker via jeagles)
 
+MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1463807 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-04-02 Thread tgraves
Author: tgraves
Date: Wed Apr  3 01:46:39 2013
New Revision: 1463807

URL: http://svn.apache.org/r1463807
Log:
MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1463807&r1=1463806&r2=1463807&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Apr  3 01:46:39 2013
@@ -115,6 +115,8 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream
 does not close the wrapped InputStream.  (Chris Nauroth via tgraves)
 
+MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES




svn commit: r1463806 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

2013-04-02 Thread tgraves
Author: tgraves
Date: Wed Apr  3 01:45:24 2013
New Revision: 1463806

URL: http://svn.apache.org/r1463806
Log:
MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1463806&r1=1463805&r2=1463806&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Apr  3 
01:45:24 2013
@@ -759,6 +759,7 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear
 the value from the Task commitAttempt member (Robert Parker via jeagles)
 
+MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
 
 Release 0.23.6 - UNRELEASED
 




svn commit: r1461305 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 20:50:46 2013
New Revision: 1461305

URL: http://svn.apache.org/r1461305
Log:
MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream does 
not close the wrapped InputStream.  (Chris Nauroth via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1461305&r1=1461304&r2=1461305&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 20:50:46 2013
@@ -109,6 +109,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause
 reducer to fail (Robert Parker via jeagles)
 
+MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream
+does not close the wrapped InputStream.  (Chris Nauroth via tgraves)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES




svn commit: r1461296 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 20:10:04 2013
New Revision: 1461296

URL: http://svn.apache.org/r1461296
Log:
MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and 
sortFinished times when needed. (Ravi Gummadi via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461296&r1=1461295&r2=1461296&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 20:10:04 2013
@@ -107,6 +107,9 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter
 strings. (ravigummadi via tgraves) 
 
+MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and
+sortFinished times when needed. (Ravi Gummadi via tgraves)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461289 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 19:54:51 2013
New Revision: 1461289

URL: http://svn.apache.org/r1461289
Log:
MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. 
(ravigummadi via tgraves) 

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461289&r1=1461288&r2=1461289&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 19:54:51 2013
@@ -104,6 +104,9 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-4356. [Rumen] Provide access to the method
 ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
 
+MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter
+strings. (ravigummadi via tgraves) 
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461277 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 19:26:36 2013
New Revision: 1461277

URL: http://svn.apache.org/r1461277
Log:
MAPREDUCE-4356. [Rumen] Provide access to the method 
ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461277&r1=1461276&r2=1461277&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 19:26:36 2013
@@ -101,6 +101,9 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for 
 map only jobs. (amarrk via tgraves)
 
+MAPREDUCE-4356. [Rumen] Provide access to the method
+ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461275 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 19:21:43 2013
New Revision: 1461275

URL: http://svn.apache.org/r1461275
Log:
MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map 
only jobs. (amarrk via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461275&r1=1461274&r2=1461275&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 19:21:43 2013
@@ -98,6 +98,9 @@ Release 2.0.5-beta - UNRELEASED
 
 MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
 
+MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for 
+map only jobs. (amarrk via tgraves)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461272 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 19:08:26 2013
New Revision: 1461272

URL: http://svn.apache.org/r1461272
Log:
MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461272&r1=1461271&r2=1461272&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 19:08:26 2013
@@ -96,6 +96,8 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running
 tasks in Gridmix. (amarrk via tgraves)
 
+MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461269 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 19:00:53 2013
New Revision: 1461269

URL: http://svn.apache.org/r1461269
Log:
MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running 
tasks in Gridmix. (amarrk via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461269&r1=1461268&r2=1461269&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 19:00:53 2013
@@ -93,6 +93,8 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related
 code. (Karthik Kambatla via sseth)
 
+MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running
+tasks in Gridmix. (amarrk via tgraves)
 
 Release 2.0.4-alpha - UNRELEASED
 




svn commit: r1461243 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 18:00:30 2013
New Revision: 1461243

URL: http://svn.apache.org/r1461243
Log:
MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow 
in some cases (ravigummadi via tgraves).

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461243&r1=1461242&r2=1461243&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 18:00:30 2013
@@ -87,6 +87,9 @@ Release 2.0.5-beta - UNRELEASED
 job if the trace contains null taskStatus for a task.  (ravigummadi via 
 tgraves)
 
+MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can
+become slow in some cases (ravigummadi via tgraves).
+
 
 Release 2.0.4-alpha - UNRELEASED
 




svn commit: r1461242 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 17:52:40 2013
New Revision: 1461242

URL: http://svn.apache.org/r1461242
Log:
MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the 
trace contains null taskStatus for a task.  (ravigummadi via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461242&r1=1461241&r2=1461242&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 17:52:40 2013
@@ -83,6 +83,10 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead
 counter is wrong when compressed input is used.(ravigummadi via tgraves)
 
+MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a
+job if the trace contains null taskStatus for a task.  (ravigummadi via 
+tgraves)
+
 
 Release 2.0.4-alpha - UNRELEASED
 




svn commit: r1461236 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 17:42:29 2013
New Revision: 1461236

URL: http://svn.apache.org/r1461236
Log:
MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter 
is wrong when compressed input is used.(ravigummadi via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461236&r1=1461235&r2=1461236&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 17:42:29 2013
@@ -80,6 +80,10 @@ Release 2.0.5-beta - UNRELEASED
 input data directory already exists and -generate opton is
 given.(ravigummadi via tgraves)
 
+MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead
+counter is wrong when compressed input is used.(ravigummadi via tgraves)
+
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461233 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 17:29:26 2013
New Revision: 1461233

URL: http://svn.apache.org/r1461233
Log:
MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input 
data directory already exists and -generate opton is erate opton is
+given.(ravi

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461233&r1=1461232&r2=1461233&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 17:29:26 2013
@@ -76,6 +76,10 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. (Zhijie Shen via
 vinodkv)
 
+MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when
+input data directory already exists and -generate opton is
+given.(ravigummadi via tgraves)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1461212 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-03-26 Thread tgraves
Author: tgraves
Date: Tue Mar 26 16:35:58 2013
New Revision: 1461212

URL: http://svn.apache.org/r1461212
Log:
MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster 
job submission. (amarrk via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461212&r1=1461211&r2=1461212&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 26 16:35:58 2013
@@ -20,6 +20,9 @@ Release 2.0.5-beta - UNRELEASED
 MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred 
 (Aleksey Gorshkov via bobby)
 
+MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for
+faster job submission. (amarrk via tgraves)
+
   OPTIMIZATIONS
 
   BUG FIXES




svn commit: r1458380 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce

2013-03-19 Thread tgraves
Author: tgraves
Date: Tue Mar 19 16:17:51 2013
New Revision: 1458380

URL: http://svn.apache.org/r1458380
Log:
MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1458380&r1=1458379&r2=1458380&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 19 16:17:51 2013
@@ -106,6 +106,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause
 reducer to fail (Robert Parker via jeagles)
 
+MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. 
+(kkambatl via tgraves)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java?rev=1458380&r1=1458379&r2=1458380&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
 Tue Mar 19 16:17:51 2013
@@ -1122,8 +1122,9 @@ class MapTask extends Task {
   equator = pos;
   // set index prior to first entry, aligned at meta boundary
   final int aligned = pos - (pos % METASIZE);
-  kvindex =
-((aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4;
+  // Cast one of the operands to long to ensure large values don't cause 
int
+  // overflow
+  kvindex = (int) (((long) aligned - METASIZE + kvbuffer.length) % 
kvbuffer.length) / 4;
   if (LOG.isInfoEnabled()) {
 LOG.info("(EQUATOR) " + pos + " kvi " + kvindex +
 "(" + (kvindex * 4) + ")");
@@ -1140,8 +1141,9 @@ class MapTask extends Task {
   bufstart = bufend = e;
   final int aligned = e - (e % METASIZE);
   // set start/end to point to first meta record
-  kvstart = kvend =
-((aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4;
+  // Cast one of the operands to long to ensure large values don't cause 
int
+  // overflow
+  kvstart = kvend = (int) (((long) aligned - METASIZE + kvbuffer.length) % 
kvbuffer.length) / 4;
   if (LOG.isInfoEnabled()) {
 LOG.info("(RESET) equator " + e + " kv " + kvstart + "(" +
   (kvstart * 4) + ")" + " kvi " + kvindex + "(" + (kvindex * 4) + ")");
@@ -1705,7 +1707,7 @@ class MapTask extends Task {
   this.start = 0;
 }
 
-super.reset(this.buffer, this.start, this.length);
+super.reset(this.buffer, this.start, this.length - this.start);
   }
 }
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java?rev=1458380&r1=1458379&r2=1458380&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java
 (original)
+++ 
hadoop/common/branches/branch-0

svn commit: r1458376 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/Shuff

2013-03-19 Thread tgraves
Author: tgraves
Date: Tue Mar 19 16:12:27 2013
New Revision: 1458376

URL: http://svn.apache.org/r1458376
Log:
MAPREDUCE-4990. Construct debug strings conditionally in 
ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1458376&r1=1458375&r2=1458376&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Mar 19 16:12:27 2013
@@ -28,6 +28,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5027. Shuffle does not limit number of outstanding connections
 (Robert Parker via jeagles)
 
+MAPREDUCE-4990. Construct debug strings conditionally in 
+ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tgraves)
+
   OPTIMIZATIONS
 
 MAPREDUCE-4946. Fix a performance problem for large jobs by reducing the

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java?rev=1458376&r1=1458375&r2=1458376&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
 Tue Mar 19 16:12:27 2013
@@ -494,15 +494,19 @@ public class ShuffleHandler extends Abst
   ContainerLocalizer.USERCACHE + "/" + user + "/"
   + ContainerLocalizer.APPCACHE + "/"
   + ConverterUtils.toString(appID) + "/output" + "/" + mapId;
-  LOG.debug("DEBUG0 " + base);
+  if (LOG.isDebugEnabled()) {
+LOG.debug("DEBUG0 " + base);
+  }
   // Index file
   Path indexFileName = lDirAlloc.getLocalPathToRead(
   base + "/file.out.index", conf);
   // Map-output file
   Path mapOutputFileName = lDirAlloc.getLocalPathToRead(
   base + "/file.out", conf);
-  LOG.debug("DEBUG1 " + base + " : " + mapOutputFileName + " : " +
-  indexFileName);
+  if (LOG.isDebugEnabled()) {
+LOG.debug("DEBUG1 " + base + " : " + mapOutputFileName + " : "
++ indexFileName);
+  }
   IndexRecord info = 
 indexCache.getIndexInformation(mapId, reduce, indexFileName, user);
   final ShuffleHeader header =




svn commit: r1454158 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app

2013-03-07 Thread tgraves
Author: tgraves
Date: Thu Mar  7 23:03:44 2013
New Revision: 1454158

URL: http://svn.apache.org/r1454158
Log:
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash 
via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1454158&r1=1454157&r2=1454158&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Mar  7 23:03:44 2013
@@ -88,6 +88,9 @@ Release 0.23.7 - UNRELEASED
 appropriately used and that on-disk segments are correctly sorted on
 file-size. (Anty Rao and Ravi Prakash via acmurthy) 
 
+MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi
+Prakash via tgraves)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java?rev=1454158&r1=1454157&r2=1454158&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 Thu Mar  7 23:03:44 2013
@@ -71,10 +71,15 @@ public class JobCounterInfo {
   }
 
   private void getCounters(AppContext ctx, Job job) {
-total = new Counters();
 if (job == null) {
   return;
 }
+total = job.getAllCounters();
+boolean needTotalCounters = false;
+if (total == null) {
+  total = new Counters();
+  needTotalCounters = true;
+}
 map = new Counters();
 reduce = new Counters();
 // Get all types of counters
@@ -84,7 +89,6 @@ public class JobCounterInfo {
   if (counters == null) {
 continue;
   }
-  total.incrAllCounters(counters);
   switch (t.getType()) {
   case MAP:
 map.incrAllCounters(counters);
@@ -93,6 +97,9 @@ public class JobCounterInfo {
 reduce.incrAllCounters(counters);
 break;
   }
+  if (needTotalCounters) {
+total.incrAllCounters(counters);
+  }
 }
   }
 




svn commit: r1454157 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/we

2013-03-07 Thread tgraves
Author: tgraves
Date: Thu Mar  7 23:03:10 2013
New Revision: 1454157

URL: http://svn.apache.org/r1454157
Log:
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash 
via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1454157&r1=1454156&r2=1454157&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Mar  7 23:03:10 2013
@@ -630,6 +630,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5043. Fetch failure processing can cause AM event queue to
 backup and eventually OOM (Jason Lowe via bobby)
 
+MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi
+Prakash via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java?rev=1454157&r1=1454156&r2=1454157&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 Thu Mar  7 23:03:10 2013
@@ -71,10 +71,15 @@ public class JobCounterInfo {
   }
 
   private void getCounters(AppContext ctx, Job job) {
-total = new Counters();
 if (job == null) {
   return;
 }
+total = job.getAllCounters();
+boolean needTotalCounters = false;
+if (total == null) {
+  total = new Counters();
+  needTotalCounters = true;
+}
 map = new Counters();
 reduce = new Counters();
 // Get all types of counters
@@ -84,7 +89,6 @@ public class JobCounterInfo {
   if (counters == null) {
 continue;
   }
-  total.incrAllCounters(counters);
   switch (t.getType()) {
   case MAP:
 map.incrAllCounters(counters);
@@ -93,6 +97,9 @@ public class JobCounterInfo {
 reduce.incrAllCounters(counters);
 break;
   }
+  if (needTotalCounters) {
+total.incrAllCounters(counters);
+  }
 }
   }
 




svn commit: r1454156 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/Job

2013-03-07 Thread tgraves
Author: tgraves
Date: Thu Mar  7 23:02:28 2013
New Revision: 1454156

URL: http://svn.apache.org/r1454156
Log:
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash 
via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1454156&r1=1454155&r2=1454156&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Mar  7 
23:02:28 2013
@@ -804,6 +804,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-5043. Fetch failure processing can cause AM event queue to
 backup and eventually OOM (Jason Lowe via bobby)
 
+MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi
+Prakash via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java?rev=1454156&r1=1454155&r2=1454156&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java
 Thu Mar  7 23:02:28 2013
@@ -71,10 +71,15 @@ public class JobCounterInfo {
   }
 
   private void getCounters(AppContext ctx, Job job) {
-total = new Counters();
 if (job == null) {
   return;
 }
+total = job.getAllCounters();
+boolean needTotalCounters = false;
+if (total == null) {
+  total = new Counters();
+  needTotalCounters = true;
+}
 map = new Counters();
 reduce = new Counters();
 // Get all types of counters
@@ -84,7 +89,6 @@ public class JobCounterInfo {
   if (counters == null) {
 continue;
   }
-  total.incrAllCounters(counters);
   switch (t.getType()) {
   case MAP:
 map.incrAllCounters(counters);
@@ -93,6 +97,9 @@ public class JobCounterInfo {
 reduce.incrAllCounters(counters);
 break;
   }
+  if (needTotalCounters) {
+total.incrAllCounters(counters);
+  }
 }
   }
 




svn commit: r1444854 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-02-11 Thread tgraves
Author: tgraves
Date: Mon Feb 11 16:31:34 2013
New Revision: 1444854

URL: http://svn.apache.org/r1444854
Log:
Updating release date for 0.23.6

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1444854&r1=1444853&r2=1444854&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Feb 11 16:31:34 2013
@@ -59,7 +59,7 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-4893. MR AppMaster can do sub-optimal assignment of containers
 to map tasks leading to poor node locality (Bikas Saha via jlowe)
 
-Release 0.23.6 - UNRELEASED
+Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES
 




svn commit: r1444157 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/ hado

2013-02-08 Thread tgraves
Author: tgraves
Date: Fri Feb  8 17:24:26 2013
New Revision: 1444157

URL: http://svn.apache.org/r1444157
Log:
MAPREDUCE-4671. AM does not tell the RM about container requests which are no 
longer needed. (Bikas Saha via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1444157&r1=1444156&r2=1444157&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Feb  8 17:24:26 2013
@@ -53,6 +53,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-4637. Handle TaskAttempt diagnostic updates while in the NEW and 
 UNASSIGNED states. (Mayank Bansal via tgraves)
 
+MAPREDUCE-4671. AM does not tell the RM about container requests which are
+no longer needed. (Bikas Saha via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java?rev=1444157&r1=1444156&r2=1444157&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java
 Fri Feb  8 17:24:26 2013
@@ -72,7 +72,10 @@ public abstract class RMContainerRequest
   remoteRequestsTable =
   new TreeMap>>();
 
-  private final Set ask = new TreeSet();
+  // use custom comparator to make sure ResourceRequest objects differing only 
in 
+  // numContainers dont end up as duplicates
+  private final Set ask = new TreeSet(
+  new 
org.apache.hadoop.yarn.util.BuilderUtils.ResourceRequestComparator());
   private final Set release = new TreeSet(); 
 
   private boolean nodeBlacklistingEnabled;
@@ -235,7 +238,7 @@ public abstract class RMContainerRequest
   ResourceRequest zeroedRequest = 
BuilderUtils.newResourceRequest(req);
   zeroedRequest.setNumContainers(0);
   // to be sent to RM on next heartbeat
-  ask.add(zeroedRequest);
+  addResourceRequestToAsk(zeroedRequest);
 }
   }
   // if all requests were still in ask queue
@@ -320,7 +323,7 @@ public abstract class RMContainerRequest
 remoteRequest.setNumContainers(remoteRequest.getNumContainers() + 1);
 
 // Note this down for next interaction with ResourceManager
-ask.add(remoteRequest);
+addResourceRequestToAsk(remoteRequest);
 if (LOG.isDebugEnabled()) {
   LOG.debug("addResourceRequest:" + " applicationId="
   + applicationId.getId() + " priority=" + priority.getPriority()
@@ -353,7 +356,12 @@ public abstract class RMContainerRequest
   + remoteRequest.getNumContainers() + " #asks=" + ask.size());
 }
 
-remoteRequest.setNumContainers(remoteRequest.getNumContainers() -1);
+if(remoteRequest.getNumContainers() > 0) {
+  // based on blacklisting comments above we can end up decrementing more 
+  // than requested. so guard for that.
+  remoteRequest.setNumContainers(remoteRequest.getNumContainers() -1);
+}
+
 if (remoteRequest.getNumContainers() == 0) {
   reqMap.remove(capability);
   if (reqMap.size() == 0) {
@@ -362,13 +370,12 @@ public abstract class RMContainerRequest
   if (remoteRequests.size() == 0) {
 remoteRequestsTable.remove(priority);
   }
-  //remove from ask if it may have
-  ask.remove(remoteRequest);
-} else {
-  ask.add(remoteRequest);//this will override the request if ask doesn't
-  //already have it.
 }
 
+// send the updated resource

svn commit: r1443243 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl

2013-02-06 Thread tgraves
Author: tgraves
Date: Wed Feb  6 22:22:22 2013
New Revision: 1443243

URL: http://svn.apache.org/viewvc?rev=1443243&view=rev
Log:
MAPREDUCE-4637. Handle TaskAttempt diagnostic updates while in the NEW and 
UNASSIGNED states. (Mayank Bansal via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1443243&r1=1443242&r2=1443243&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Feb  6 22:22:22 2013
@@ -47,6 +47,9 @@ Release 0.23.7 - UNRELEASED
 
 MAPREDUCE-4953. HadoopPipes misuses fprintf. (Andy Isaacson via tgraves)
 
+MAPREDUCE-4637. Handle TaskAttempt diagnostic updates while in the NEW and 
+UNASSIGNED states. (Mayank Bansal via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java?rev=1443243&r1=1443242&r2=1443243&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
 Wed Feb  6 22:22:22 2013
@@ -196,6 +196,10 @@ public abstract class TaskAttemptImpl im
  TaskAttemptEventType.TA_KILL, new KilledTransition())
  .addTransition(TaskAttemptStateInternal.NEW, 
TaskAttemptStateInternal.FAILED,
  TaskAttemptEventType.TA_FAILMSG, new FailedTransition())
+ .addTransition(TaskAttemptStateInternal.NEW,
+  TaskAttemptStateInternal.NEW,
+  TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
+  DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
 
  // Transitions from the UNASSIGNED state.
  .addTransition(TaskAttemptStateInternal.UNASSIGNED,
@@ -207,6 +211,10 @@ public abstract class TaskAttemptImpl im
  .addTransition(TaskAttemptStateInternal.UNASSIGNED, 
TaskAttemptStateInternal.FAILED,
  TaskAttemptEventType.TA_FAILMSG, new DeallocateContainerTransition(
  TaskAttemptStateInternal.FAILED, true))
+ .addTransition(TaskAttemptStateInternal.UNASSIGNED,
+  TaskAttemptStateInternal.UNASSIGNED,
+  TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
+  DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
 
  // Transitions from the ASSIGNED state.
  .addTransition(TaskAttemptStateInternal.ASSIGNED, 
TaskAttemptStateInternal.RUNNING,

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java?rev=1443243&r1=1443242&r2=1443243&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
 Wed Feb  6 22:22:22 2013
@@ -630,6 +630,106 @@ public class TestTaskAttempt{
 eventHandler.internalError);
   }
 
+  @Test
+  public void testAppDiognosticEventOnUnassignedTask() throws Exception {
+ApplicationId ap

svn commit: r1442609 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-02-05 Thread tgraves
Author: tgraves
Date: Tue Feb  5 14:33:10 2013
New Revision: 1442609

URL: http://svn.apache.org/viewvc?rev=1442609&view=rev
Log:
 MAPREDUCE-4953. HadoopPipes misuses fprintf. (Andy Isaacson via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1442609&r1=1442608&r2=1442609&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Feb  5 14:33:10 2013
@@ -42,6 +42,8 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7.
 (Arpit Agarwal via tgraves)
 
+MAPREDUCE-4953. HadoopPipes misuses fprintf. (Andy Isaacson via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES




svn commit: r1441589 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java

2013-02-01 Thread tgraves
Author: tgraves
Date: Fri Feb  1 19:18:46 2013
New Revision: 1441589

URL: http://svn.apache.org/viewvc?rev=1441589&view=rev
Log:
MAPREDUCE-4949. Enable multiple pi jobs to run in parallel. (sandyr via tucu)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1441589&r1=1441588&r2=1441589&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Feb  1 19:18:46 2013
@@ -14,6 +14,8 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce
 system JARs. (tomwhite)
 
+MAPREDUCE-4949. Enable multiple pi jobs to run in parallel. (sandyr via 
tucu)
+
   OPTIMIZATIONS
 
 MAPREDUCE-4946. Fix a performance problem for large jobs by reducing the

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java?rev=1441589&r1=1441588&r2=1441589&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/QuasiMonteCarlo.java
 Fri Feb  1 19:18:46 2013
@@ -21,6 +21,7 @@ package org.apache.hadoop.examples;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Random;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
@@ -77,8 +78,7 @@ public class QuasiMonteCarlo extends Con
   static final String DESCRIPTION
   = "A map/reduce program that estimates Pi using a quasi-Monte Carlo 
method.";
   /** tmp directory for input/output */
-  static private final Path TMP_DIR = new Path(
-  QuasiMonteCarlo.class.getSimpleName() + "_TMP_3_141592654");
+  static private final String TMP_DIR_PREFIX = 
QuasiMonteCarlo.class.getSimpleName();
   
   /** 2-dimensional Halton sequence {H(i)},
* where H(i) is a 2-dimensional point and i >= 1 is the index.
@@ -228,9 +228,9 @@ public class QuasiMonteCarlo extends Con
 @Override
 public void cleanup(Context context) throws IOException {
   //write output to a file
-  Path outDir = new Path(TMP_DIR, "out");
-  Path outFile = new Path(outDir, "reduce-out");
   Configuration conf = context.getConfiguration();
+  Path outDir = new Path(conf.get(FileOutputFormat.OUTDIR));
+  Path outFile = new Path(outDir, "reduce-out");
   FileSystem fileSys = FileSystem.get(conf);
   SequenceFile.Writer writer = SequenceFile.createWriter(fileSys, conf,
   outFile, LongWritable.class, LongWritable.class, 
@@ -246,7 +246,7 @@ public class QuasiMonteCarlo extends Con
* @return the estimated value of Pi
*/
   public static BigDecimal estimatePi(int numMaps, long numPoints,
-  Configuration conf
+  Path tmpDir, Configuration conf
   ) throws IOException, ClassNotFoundException, InterruptedException {
 Job job = new Job(conf);
 //setup job conf
@@ -269,14 +269,14 @@ public class QuasiMonteCarlo extends Con
 job.setSpeculativeExecution(false);
 
 //setup input/output directories
-final Path inDir = new Path(TMP_DIR, "in");
-final Path outDir = new Path(TMP_DIR, "out");
+final Path inDir = new Path(tmpDir, "in");
+final Path outDir = new Path(tmpDir, "out");
 FileInputFormat.setInputPaths(job, inDir);
 FileOutputFormat.setOutputPath(job, outDir);
 
 final FileSystem fs = FileSystem.get(conf);
-if (fs.exists(TMP_DIR)) {
-  throw new IOException("Tmp directory " + fs.makeQualified(TMP_DIR)
+if (fs.exists(tmpDir)) {
+  throw new IOException("Tmp directory " + fs.makeQualified(tmpDir)
   + " already exists.  Please remove it first.");
 }
 if (!fs.mkdirs(inDir)) {
@@ -325,7 +325,7 @@ public class QuasiMonteCarlo extends Con
   .multiply(BigDecimal.valueOf(numInside.get()))
   .divide(numTot

svn commit: r1441585 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/Tes

2013-02-01 Thread tgraves
Author: tgraves
Date: Fri Feb  1 19:06:11 2013
New Revision: 1441585

URL: http://svn.apache.org/viewvc?rev=1441585&view=rev
Log:
MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7. (Arpit 
Agarwal via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1441585&r1=1441584&r2=1441585&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Feb  1 19:06:11 2013
@@ -34,6 +34,9 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov 
 via tgraves)
 
+MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7.
+(Arpit Agarwal via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=1441585&r1=1441584&r2=1441585&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
 Fri Feb  1 19:06:11 2013
@@ -136,32 +136,47 @@ public class TestKeyValueTextInputFormat
   }
   
   public void testUTF8() throws Exception {
-LineReader in = makeStream("abcd\u20acbdcd\u20ac");
-Text line = new Text();
-in.readLine(line);
-assertEquals("readLine changed utf8 characters", 
- "abcd\u20acbdcd\u20ac", line.toString());
-in = makeStream("abc\u200axyz");
-in.readLine(line);
-assertEquals("split on fake newline", "abc\u200axyz", line.toString());
+LineReader in = null;
+
+try {
+  in = makeStream("abcd\u20acbdcd\u20ac");
+  Text line = new Text();
+  in.readLine(line);
+  assertEquals("readLine changed utf8 characters",
+   "abcd\u20acbdcd\u20ac", line.toString());
+  in = makeStream("abc\u200axyz");
+  in.readLine(line);
+  assertEquals("split on fake newline", "abc\u200axyz", line.toString());
+} finally {
+  if (in != null) {
+in.close();
+  }
+}
   }
 
   public void testNewLines() throws Exception {
-LineReader in = makeStream("a\nbb\n\nccc\r\r\ne");
-Text out = new Text();
-in.readLine(out);
-assertEquals("line1 length", 1, out.getLength());
-in.readLine(out);
-assertEquals("line2 length", 2, out.getLength());
-in.readLine(out);
-assertEquals("line3 length", 0, out.getLength());
-in.readLine(out);
-assertEquals("line4 length", 3, out.getLength());
-in.readLine(out);
-assertEquals("line5 length", 4, out.getLength());
-in.readLine(out);
-assertEquals("line5 length", 5, out.getLength());
-assertEquals("end of file", 0, in.readLine(out));
+LineReader in = null;
+try {
+  in = makeStream("a\nbb\n\nccc\r\r\ne");
+  Text out = new Text();
+  in.readLine(out);
+  assertEquals("line1 length", 1, out.getLength());
+  in.readLine(out);
+  assertEquals("line2 length", 2, out.getLength());
+  in.readLine(out);
+  assertEquals("line3 length", 0, out.getLength());
+  in.readLine(out);
+  assertEquals("line4 length", 3, out.getLength());
+  in.readLine(out);
+  assertEquals("line5 length", 4, out.getLength());
+  in.readLine(out);
+  assertEquals("line5 length", 5, out.getLength());
+  assertEquals("end of file", 0, in.readLine(out));
+} finally {
+  if (in != null) {
+in.close();
+  

svn commit: r1441494 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/ had

2013-02-01 Thread tgraves
Author: tgraves
Date: Fri Feb  1 15:50:43 2013
New Revision: 1441494

URL: http://svn.apache.org/viewvc?rev=1441494&view=rev
Log:
MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1441494&r1=1441493&r2=1441494&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Feb  1 15:50:43 2013
@@ -31,6 +31,9 @@ Release 0.23.7 - UNRELEASED
 CombinefileInputFormat.getSplits() returns 0 split. (Bhallamudi 
 Venkata Siva Kamesh via tgraves)
 
+MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov 
+via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java?rev=1441494&r1=1441493&r2=1441494&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
 Fri Feb  1 15:50:43 2013
@@ -499,6 +499,10 @@ public abstract class CombineFileInputFo
 blocks = new OneBlockInfo[0];
   } else {
 
+if(locations.length == 0) {
+  locations = new BlockLocation[] { new BlockLocation() };
+}
+
 if (!isSplitable) {
   // if the file is not splitable, just create the one block with
   // full file length

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java?rev=1441494&r1=1441493&r2=1441494&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
 Fri Feb  1 15:50:43 2013
@@ -33,7 +33,9 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.InputSplit;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.JobContext;
@@ -136,6 +138,43 @@ public class TestFileInputFormat {
 }
   }
 
+  /**
+   * Test when the input file's length is 0.
+   */
+  @Test
+  public void testForEmptyFile() throws Exception {
+  Configuration conf = new Configuration();
+  FileSystem fileSys = FileSystem.get(conf);
+  Path file = new Path("test" + "/file");
+  FSDataOutputStream out = fileSys.create(file, true,
+  conf.getInt("io.file.buffer.size", 4096), (short) 1, (long) 
1024);
+  out.write(new byte[0]);
+  out.close();
+
+  // split it using a File input format
+  DummyInputForm

svn commit: r1441492 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/ had

2013-02-01 Thread tgraves
Author: tgraves
Date: Fri Feb  1 15:42:55 2013
New Revision: 1441492

URL: http://svn.apache.org/viewvc?rev=1441492&view=rev
Log:
MAPREDUCE-3952. In MR2, when Total input paths to process == 
1,CombinefileInputFormat.getSplits() returns 0 split. (Bhallamudi Venkata Siva 
Kamesh via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1441492&r1=1441491&r2=1441492&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Feb  1 15:42:55 2013
@@ -27,6 +27,10 @@ Release 0.23.7 - UNRELEASED
 MAPREDUCE-4458. Warn if java.library.path is used for AM or Task
 (Robert Parker via jeagles)
 
+MAPREDUCE-3952. In MR2, when Total input paths to process == 1,
+CombinefileInputFormat.getSplits() returns 0 split. (Bhallamudi 
+Venkata Siva Kamesh via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java?rev=1441492&r1=1441491&r2=1441492&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
 Fri Feb  1 15:42:55 2013
@@ -498,6 +498,7 @@ public abstract class CombineFileInputFo
   if (locations == null) {
 blocks = new OneBlockInfo[0];
   } else {
+
 if (!isSplitable) {
   // if the file is not splitable, just create the one block with
   // full file length
@@ -515,7 +516,7 @@ public abstract class CombineFileInputFo
 long left = locations[i].getLength();
 long myOffset = locations[i].getOffset();
 long myLength = 0;
-while (left > 0) {
+do {
   if (maxSize == 0) {
 myLength = left;
   } else {
@@ -537,7 +538,7 @@ public abstract class CombineFileInputFo
   myOffset += myLength;
 
   blocksList.add(oneblock);
-}
+} while (left > 0);
   }
   blocks = blocksList.toArray(new OneBlockInfo[blocksList.size()]);
 }

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java?rev=1441492&r1=1441491&r2=1441492&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
 Fri Feb  1 15:42:55 2013
@@ -1147,6 +1147,35 @@ public class TestCombineFileInputFormat 
 }
   }
 
+  
+  /**
+   * Test when the input file's length is 0.
+   */
+  @Test
+  public void testForEmptyFile() throws Exception {
+Configuration conf = new Configuration();
+FileSystem fileSys = FileSystem.get(conf);
+Path file = new Path("test&q

svn commit: r1434878 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/ hadoop-mapredu

2013-01-17 Thread tgraves
Author: tgraves
Date: Thu Jan 17 19:54:00 2013
New Revision: 1434878

URL: http://svn.apache.org/viewvc?rev=1434878&view=rev
Log:
MAPREDUCE-4278. cannot run two local jobs in parallel from the same gateway. 
(Sandy Ryza via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobID.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1434878&r1=1434877&r2=1434878&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Jan 17 19:54:00 2013
@@ -15,6 +15,9 @@ Release 0.23.7 - UNRELEASED
 
   BUG FIXES
 
+MAPREDUCE-4278. cannot run two local jobs in parallel from the same 
+gateway. (Sandy Ryza via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=1434878&r1=1434877&r2=1434878&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java
 Thu Jan 17 19:54:00 2013
@@ -609,8 +609,12 @@ public class LocalJobRunner implements C
   // JobSubmissionProtocol methods
 
   private static int jobid = 0;
+  // used for making sure that local jobs run in different jvms don't
+  // collide on staging or job directories
+  private int randid;
+  
   public synchronized org.apache.hadoop.mapreduce.JobID getNewJobID() {
-return new org.apache.hadoop.mapreduce.JobID("local", ++jobid);
+return new org.apache.hadoop.mapreduce.JobID("local" + randid, ++jobid);
   }
 
   public org.apache.hadoop.mapreduce.JobStatus submitJob(
@@ -739,10 +743,11 @@ public class LocalJobRunner implements C
 "/tmp/hadoop/mapred/staging"));
 UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
 String user;
+randid = rand.nextInt(Integer.MAX_VALUE);
 if (ugi != null) {
-  user = ugi.getShortUserName() + rand.nextInt();
+  user = ugi.getShortUserName() + randid;
 } else {
-  user = "dummy" + rand.nextInt();
+  user = "dummy" + randid;
 }
 return fs.makeQualified(new Path(stagingRootDir, 
user+"/.staging")).toString();
   }

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobID.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobID.java?rev=1434878&r1=1434877&r2=1434878&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobID.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobID.java
 Thu Jan 17 19:54:00 2013
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text;
  * the job. JobID consists of two parts. First part 
  * represents the jobtracker identifier, so that jobID to jobtracker map 
  * is defined. For cluster setup this string is the jobtracker 
- * start time, for local setting, it is "local".
+ * start time, for local setting, it is "local" and a random number.
  * Second part of the JobID is the job number.  
  * An example JobID is : 
  * job_200707121733_0003 , which represents the third job 




svn commit: r1434807 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ hadoop-mapred

2013-01-17 Thread tgraves
Author: tgraves
Date: Thu Jan 17 17:42:14 2013
New Revision: 1434807

URL: http://svn.apache.org/viewvc?rev=1434807&view=rev
Log:
MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus 
calls  (Sandy Ryza via tgraves)

Added:

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/filecache/
  - copied from r1431510, 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/filecache/

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/filecache/TestClientDistributedCacheManager.java
  - copied unchanged from r1431510, 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/filecache/TestClientDistributedCacheManager.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/filecache/ClientDistributedCacheManager.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1434807&r1=1434806&r2=1434807&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Jan 17 17:42:14 2013
@@ -8,6 +8,9 @@ Release 0.23.7 - UNRELEASED
 
   IMPROVEMENTS
 
+MAPREDUCE-4907. TrackerDistributedCacheManager issues too many 
+getFileStatus calls  (Sandy Ryza via tgraves)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java?rev=1434807&r1=1434806&r2=1434807&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
 Thu Jan 17 17:42:14 2013
@@ -249,9 +249,8 @@ class JobSubmitter {
 }
 
 //  set the timestamps of the archives and files
-ClientDistributedCacheManager.determineTimestamps(conf);
 //  set the public/private visibility of the archives and files
-ClientDistributedCacheManager.determineCacheVisibilities(conf);
+
ClientDistributedCacheManager.determineTimestampsAndCacheVisibilities(conf);
 // get DelegationToken for each cached file
 ClientDistributedCacheManager.getDelegationTokens(conf, job
 .getCredentials());

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/filecache/ClientDistributedCacheManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/filecache/ClientDistributedCacheManager.java?rev=1434807&r1=1434806&r2=1434807&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/filecache/ClientDistributedCacheManager.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/filecache/ClientDistributedCacheManager.java
 Thu Jan 17 17:42:14 2013
@@ -19,6 +19,8 @@ package org.apache.hadoop.mapreduce.file
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Config

svn commit: r1434086 - in /hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2013-01-16 Thread tgraves
Author: tgraves
Date: Wed Jan 16 18:20:08 2013
New Revision: 1434086

URL: http://svn.apache.org/viewvc?rev=1434086&view=rev
Log:
Preparing for release 0.23.6

Modified:

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff
==
--- 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Wed Jan 16 18:20:08 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.6
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.6-SNAPSHOT
+  0.23.6
   hadoop-mapreduce-client-app
 
   
@@ -105,7 +105,7 @@
   
 
-
   
 

Modified: 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff
==
--- 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Wed Jan 16 18:20:08 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.6
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.6-SNAPSHOT
+  0.23.6
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff
==
--- 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Wed Jan 16 18:20:08 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.6
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-core
-  0.23.6-SNAPSHOT
+  0.23.6
   hadoop-mapreduce-client-core
 
   

Modified: 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff
==
--- 
hadoop/common/branches/branch-0.23.6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.6/hadoop-mapred

svn commit: r1434031 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2013-01-16 Thread tgraves
Author: tgraves
Date: Wed Jan 16 16:46:12 2013
New Revision: 1434031

URL: http://svn.apache.org/viewvc?rev=1434031&view=rev
Log:
Preparing for release 0.23.6

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1434031&r1=1434030&r2=1434031&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Jan 16 16:46:12 2013
@@ -478,6 +478,18 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
+Release 0.23.7 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -551,7 +563,7 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4925. The pentomino option parser may be buggy.
 (Karthik Kambatla via harsh)
 
-Release 0.23.5 - UNRELEASED
+Release 0.23.5 - 2012-11-28
 
   INCOMPATIBLE CHANGES
 




svn commit: r1434030 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

2013-01-16 Thread tgraves
Author: tgraves
Date: Wed Jan 16 16:43:12 2013
New Revision: 1434030

URL: http://svn.apache.org/viewvc?rev=1434030&view=rev
Log:
Preparing for release 0.23.6

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1434030&r1=1434029&r2=1434030&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Jan 16 
16:43:12 2013
@@ -635,6 +635,18 @@ Release 2.0.0-alpha - 05-23-2012
 MAPREDUCE-. nodemanager fails to start when one of the local-dirs is
 bad (Jason Lowe via bobby)
 
+Release 0.23.7 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -708,7 +720,7 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4925. The pentomino option parser may be buggy.
 (Karthik Kambatla via harsh)
 
-Release 0.23.5 - UNRELEASED
+Release 0.23.5 - 2012-11-28
 
   INCOMPATIBLE CHANGES
 




svn commit: r1434009 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoop-

2013-01-16 Thread tgraves
Author: tgraves
Date: Wed Jan 16 16:10:38 2013
New Revision: 1434009

URL: http://svn.apache.org/viewvc?rev=1434009&view=rev
Log:
Preparing for 0.23.7 development

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1434009&r1=1434008&r2=1434009&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Jan 16 16:10:38 2013
@@ -1,5 +1,17 @@
 Hadoop MapReduce Change Log
 
+Release 0.23.7 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Wed Jan 16 16:10:38 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.7-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.6-SNAPSHOT
+  0.23.7-SNAPSHOT
   hadoop-mapreduce-client-app
 
   
@@ -105,7 +105,7 @@
   
 
-
   
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Wed Jan 16 16:10:38 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.7-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.6-SNAPSHOT
+  0.23.7-SNAPSHOT
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 Wed Jan 16 16:10:38 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apa

svn commit: r1433998 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2013-01-16 Thread tgraves
Author: tgraves
Date: Wed Jan 16 15:53:38 2013
New Revision: 1433998

URL: http://svn.apache.org/viewvc?rev=1433998&view=rev
Log:
Preparing for release 0.23.6

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1433998&r1=1433997&r2=1433998&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Jan 16 15:53:38 2013
@@ -89,7 +89,7 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4921. JobClient should acquire HS token with RM principal 
 (Daryn Sharp via bobby)
 
-Release 0.23.5 - UNRELEASED
+Release 0.23.5 - 2012-11-28
 
   INCOMPATIBLE CHANGES
 




svn commit: r1432945 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/ hadoop-mapred

2013-01-14 Thread tgraves
Author: tgraves
Date: Mon Jan 14 15:08:56 2013
New Revision: 1432945

URL: http://svn.apache.org/viewvc?rev=1432945&view=rev
Log:
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/mapred-site.xml.template

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncherImpl.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1432945&r1=1432944&r2=1432945&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Jan 14 15:08:56 2013
@@ -78,6 +78,8 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery (Jerry
 Chen via jlowe)
 
+MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/mapred-site.xml.template
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/mapred-site.xml.template?rev=1432945&r1=1432944&r2=1432945&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/mapred-site.xml.template
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf/mapred-site.xml.template
 Mon Jan 14 15:08:56 2013
@@ -1,5 +1,18 @@
 
 
+
 
 
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo?rev=1432945&r1=1432944&r2=1432945&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-

svn commit: r1432940 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/ hadoop-mapreduce

2013-01-14 Thread tgraves
Author: tgraves
Date: Mon Jan 14 15:01:35 2013
New Revision: 1432940

URL: http://svn.apache.org/viewvc?rev=1432940&view=rev
Log:
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/mapred-site.xml.template

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncherImpl.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1432940&r1=1432939&r2=1432940&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon 
Jan 14 15:01:35 2013
@@ -534,6 +534,8 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4921. JobClient should acquire HS token with RM principal 
 (daryn via bobby)
 
+MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/mapred-site.xml.template
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/mapred-site.xml.template?rev=1432940&r1=1432939&r2=1432940&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/mapred-site.xml.template
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/mapred-site.xml.template
 Mon Jan 14 15:01:35 2013
@@ -1,5 +1,18 @@
 
 
+
 
 
 

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo?rev=1432940&r1=1432939&r2=1432940&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-

svn commit: r1432932 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/ hadoop-mapreduce-client/hado

2013-01-14 Thread tgraves
Author: tgraves
Date: Mon Jan 14 14:35:45 2013
New Revision: 1432932

URL: http://svn.apache.org/viewvc?rev=1432932&view=rev
Log:
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/conf/mapred-site.xml.template

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncherImpl.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java
hadoop/common/trunk/hadoop-mapreduce-project/pom.xml

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1432932&r1=1432931&r2=1432932&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Jan 14 
14:35:45 2013
@@ -694,6 +694,8 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4921. JobClient should acquire HS token with RM principal 
 (daryn via bobby)
 
+MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/conf/mapred-site.xml.template
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/conf/mapred-site.xml.template?rev=1432932&r1=1432931&r2=1432932&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/conf/mapred-site.xml.template 
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/conf/mapred-site.xml.template 
Mon Jan 14 14:35:45 2013
@@ -1,5 +1,18 @@
 
 
+
 
 
 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo?rev=1432932&r1=1432931&r2=1432932&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
 Mon Jan 14 14:35:45 2013
@@ -1 +1,14 @@
+#
+#   Licensed under the Apache License, Version 2

svn commit: r1432150 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ hadoop-mapred

2013-01-11 Thread tgraves
Author: tgraves
Date: Fri Jan 11 16:58:06 2013
New Revision: 1432150

URL: http://svn.apache.org/viewvc?rev=1432150&view=rev
Log:
MAPREDUCE-4810. Added new admin command options for MR AM. (Jerry Chen via 
tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestYARNRunner.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1432150&r1=1432149&r2=1432150&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri 
Jan 11 16:58:06 2013
@@ -21,6 +21,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth
 Seth via tgraves)
 
+MAPREDUCE-4810. Added new admin command options for MR AM. (Jerry Chen via
+tgraves)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1432150&r1=1432149&r2=1432150&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
 Fri Jan 11 16:58:06 2013
@@ -353,6 +353,11 @@ public interface MRJobConfig {
 MR_AM_PREFIX+"command-opts";
   public static final String DEFAULT_MR_AM_COMMAND_OPTS = "-Xmx1024m";
 
+  /** Admin command opts passed to the MR app master.*/
+  public static final String MR_AM_ADMIN_COMMAND_OPTS =
+  MR_AM_PREFIX+"admin-command-opts";
+  public static final String DEFAULT_MR_AM_ADMIN_COMMAND_OPTS = "";
+  
   /** Root Logging level passed to the MR app master.*/
   public static final String MR_AM_LOG_LEVEL = 
 MR_AM_PREFIX+"log.level";

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1432150&r1=1432149&r2=1432150&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 Fri Jan 11 16:58:06 2013
@@ -1243,6 +1243,20 @@
 
 
 
+  yarn.app.mapreduce.am.admin-command-opts
+  
+  Java opts for the MR App Master processes for admin purposes.
+  It will appears before the opts set by yarn.app.mapreduce.am.command-opts and
+  thus its options can be overridden user. 
+  
+  Usage of -Djava.library.path can cause programs to no longer function if
+  hadoop native libraries are used. These values should instead be set as part 
+  of LD_LIBRARY_PATH in the map / reduce JVM env using the mapreduce.map.env 
and 
+  mapreduce.reduce.env config settings. 
+  
+
+
+
   yarn.app.mapreduce.am.job.task.listener.thread-count
   30
   The number of threads used to handle RPC calls in the 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
URL:

svn commit: r1430470 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

2013-01-08 Thread tgraves
Author: tgraves
Date: Tue Jan  8 19:53:32 2013
New Revision: 1430470

URL: http://svn.apache.org/viewvc?rev=1430470&view=rev
Log:
MAPREDUCE-4899 fix branch-2 merge issue in pom

Modified:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1430470&r1=1430469&r2=1430470&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml
 Tue Jan  8 19:53:32 2013
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-3.0.0-SNAPSHOT
+2.0.3-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-hs-plugins
-  3.0.0-SNAPSHOT
+  2.0.3-SNAPSHOT
   hadoop-mapreduce-client-hs-plugins
 
   




svn commit: r1429377 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app

2013-01-05 Thread tgraves
Author: tgraves
Date: Sat Jan  5 20:19:32 2013
New Revision: 1429377

URL: http://svn.apache.org/viewvc?rev=1429377&view=rev
Log:
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally  
exits (Jason Lowe via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1429377&r1=1429376&r2=1429377&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Sat 
Jan  5 20:19:32 2013
@@ -69,6 +69,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4819. AM can rerun job after reporting final job status to the
 client (bobby and Bikas Saha via bobby)
 
+MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally 
+exits (Jason Lowe via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1429377&r1=1429376&r2=1429377&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 Sat Jan  5 20:19:32 2013
@@ -295,16 +295,20 @@ public class MRAppMaster extends Composi
   dispatcher = createDispatcher();
   addIfService(dispatcher);
   
+  NoopEventHandler eater = new NoopEventHandler();
+  //We do not have a JobEventDispatcher in this path
+  dispatcher.register(JobEventType.class, eater);
+
   EventHandler historyService = null;
   if (copyHistory) {
 historyService = 
   createJobHistoryHandler(context);
 
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
 historyService);
+  } else {
+
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
+eater);
   }
-  NoopEventHandler eater = new NoopEventHandler();
-  //We do not have a JobEventDispatcher in this path
-  dispatcher.register(JobEventType.class, eater);
   
   // service to allocate containers from RM (if non-uber) or to fake it 
(uber)
   containerAllocator = createContainerAllocator(null, context);




svn commit: r1429376 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MR

2013-01-05 Thread tgraves
Author: tgraves
Date: Sat Jan  5 20:19:18 2013
New Revision: 1429376

URL: http://svn.apache.org/viewvc?rev=1429376&view=rev
Log:
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally  
exits (Jason Lowe via tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1429376&r1=1429375&r2=1429376&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sat 
Jan  5 20:19:18 2013
@@ -507,6 +507,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4819. AM can rerun job after reporting final job status to the
 client (bobby and Bikas Saha via bobby)
 
+MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally 
+exits (Jason Lowe via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1429376&r1=1429375&r2=1429376&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 Sat Jan  5 20:19:18 2013
@@ -295,16 +295,20 @@ public class MRAppMaster extends Composi
   dispatcher = createDispatcher();
   addIfService(dispatcher);
   
+  NoopEventHandler eater = new NoopEventHandler();
+  //We do not have a JobEventDispatcher in this path
+  dispatcher.register(JobEventType.class, eater);
+
   EventHandler historyService = null;
   if (copyHistory) {
 historyService = 
   createJobHistoryHandler(context);
 
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
 historyService);
+  } else {
+
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
+eater);
   }
-  NoopEventHandler eater = new NoopEventHandler();
-  //We do not have a JobEventDispatcher in this path
-  dispatcher.register(JobEventType.class, eater);
   
   // service to allocate containers from RM (if non-uber) or to fake it 
(uber)
   containerAllocator = createContainerAllocator(null, context);




svn commit: r1429371 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.ja

2013-01-05 Thread tgraves
Author: tgraves
Date: Sat Jan  5 20:07:24 2013
New Revision: 1429371

URL: http://svn.apache.org/viewvc?rev=1429371&view=rev
Log:
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally  
exits (Jason Lowe via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1429371&r1=1429370&r2=1429371&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Sat Jan  5 
20:07:24 2013
@@ -667,6 +667,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4819. AM can rerun job after reporting final job status to the
 client (bobby and Bikas Saha via bobby)
 
+MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally 
+exits (Jason Lowe via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1429371&r1=1429370&r2=1429371&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 Sat Jan  5 20:07:24 2013
@@ -295,16 +295,20 @@ public class MRAppMaster extends Composi
   dispatcher = createDispatcher();
   addIfService(dispatcher);
   
+  NoopEventHandler eater = new NoopEventHandler();
+  //We do not have a JobEventDispatcher in this path
+  dispatcher.register(JobEventType.class, eater);
+
   EventHandler historyService = null;
   if (copyHistory) {
 historyService = 
   createJobHistoryHandler(context);
 
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
 historyService);
+  } else {
+
dispatcher.register(org.apache.hadoop.mapreduce.jobhistory.EventType.class,
+eater);
   }
-  NoopEventHandler eater = new NoopEventHandler();
-  //We do not have a JobEventDispatcher in this path
-  dispatcher.register(JobEventType.class, eater);
   
   // service to allocate containers from RM (if non-uber) or to fake it 
(uber)
   containerAllocator = createContainerAllocator(null, context);




svn commit: r1429097 [2/2] - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/cl

2013-01-04 Thread tgraves
Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java?rev=1429097&r1=1429096&r2=1429097&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
 Fri Jan  4 20:28:15 2013
@@ -18,19 +18,29 @@
 
 package org.apache.hadoop.mapreduce.security;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.net.InetSocketAddress;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 
 import junit.framework.Assert;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.v2.api.HSClientProtocol;
 import org.apache.hadoop.mapreduce.v2.api.MRClientProtocol;
+import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.CancelDelegationTokenRequest;
 import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.GetDelegationTokenRequest;
 import org.apache.hadoop.mapreduce.v2.api.protocolrecords.GetJobReportRequest;
+import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.RenewDelegationTokenRequest;
+import org.apache.hadoop.mapreduce.v2.hs.JHSDelegationTokenSecretManager;
 import org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils;
@@ -49,6 +59,8 @@ import org.junit.Test;
 
 public class TestJHSSecurity {
 
+  private static final Log LOG = LogFactory.getLog(TestJHSSecurity.class);
+  
   @Test
   public void testDelegationToken() throws IOException, InterruptedException {
 
@@ -63,55 +75,211 @@ public class TestJHSSecurity {
 conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
   "kerberos");
 UserGroupInformation.setConfiguration(conf);
-
-final JobHistoryServer jobHistoryServer = new JobHistoryServer() {
-  protected void doSecureLogin(Configuration conf) throws IOException {
-// no keytab based login
+
+final long initialInterval = 1l;
+final long maxLifetime= 2l;
+final long renewInterval = 1l;
+
+JobHistoryServer jobHistoryServer = null;
+MRClientProtocol clientUsingDT = null;
+long tokenFetchTime;
+try {
+  jobHistoryServer = new JobHistoryServer() {
+protected void doSecureLogin(Configuration conf) throws IOException {
+  // no keytab based login
+};
+
+protected JHSDelegationTokenSecretManager createJHSSecretManager(
+Configuration conf) {
+  return new JHSDelegationTokenSecretManager(initialInterval, 
+  maxLifetime, renewInterval, 360);
+}
   };
-};
-jobHistoryServer.init(conf);
-jobHistoryServer.start();
-
-// Fake the authentication-method
-UserGroupInformation loggedInUser = UserGroupInformation.getCurrentUser();
-loggedInUser.setAuthenticationMethod(AuthenticationMethod.KERBEROS);
+//  final JobHistoryServer jobHistoryServer = jhServer;
+  jobHistoryServer.init(conf);
+  jobHistoryServer.start();
+  final MRClientProtocol hsService = jobHistoryServer.getClientService()
+  .getClientHandler();
+
+  // Fake the authentication-method
+  UserGroupInformation loggedInUser = UserGroupInformation
+  .createRemoteUser("testrene...@apache.org");
+  Assert.assertEquals("testrenewer", loggedInUser.getShortUserName());
+  // Default realm is APACHE.ORG
+  loggedInUser.setAuthenticationMethod(AuthenticationMethod.KERBEROS);
+
+
+  DelegationToken token =
+  getDelegationToken(loggedInUser, hsService,
+  loggedInUser.getShortUserName());
+  tokenFetchTime = System.currentTimeMillis();
+  LOG.info("Got delegation token at: " + tokenFetchTime);
+
+  // Now try talking to JHS using the delegation token
+  clientUsingDT = getMRClientProtocol(token, jobHistoryServer
+  .getClientService().getBindAddress(), "TheDarkLord", conf);
+
+  GetJobReport

svn commit: r1429086 [2/2] - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/ hadoop-ma

2013-01-04 Thread tgraves
Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java?rev=1429086&r1=1429085&r2=1429086&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestJHSSecurity.java
 Fri Jan  4 20:15:43 2013
@@ -18,19 +18,29 @@
 
 package org.apache.hadoop.mapreduce.security;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.net.InetSocketAddress;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 
 import junit.framework.Assert;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.v2.api.HSClientProtocol;
 import org.apache.hadoop.mapreduce.v2.api.MRClientProtocol;
+import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.CancelDelegationTokenRequest;
 import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.GetDelegationTokenRequest;
 import org.apache.hadoop.mapreduce.v2.api.protocolrecords.GetJobReportRequest;
+import 
org.apache.hadoop.mapreduce.v2.api.protocolrecords.RenewDelegationTokenRequest;
+import org.apache.hadoop.mapreduce.v2.hs.JHSDelegationTokenSecretManager;
 import org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils;
@@ -49,6 +59,8 @@ import org.junit.Test;
 
 public class TestJHSSecurity {
 
+  private static final Log LOG = LogFactory.getLog(TestJHSSecurity.class);
+  
   @Test
   public void testDelegationToken() throws IOException, InterruptedException {
 
@@ -63,55 +75,208 @@ public class TestJHSSecurity {
 conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
   "kerberos");
 UserGroupInformation.setConfiguration(conf);
-
-final JobHistoryServer jobHistoryServer = new JobHistoryServer() {
-  protected void doSecureLogin(Configuration conf) throws IOException {
-// no keytab based login
+
+final long initialInterval = 1l;
+final long maxLifetime= 2l;
+final long renewInterval = 1l;
+
+JobHistoryServer jobHistoryServer = null;
+MRClientProtocol clientUsingDT = null;
+long tokenFetchTime;
+try {
+  jobHistoryServer = new JobHistoryServer() {
+protected void doSecureLogin(Configuration conf) throws IOException {
+  // no keytab based login
+};
+
+protected JHSDelegationTokenSecretManager createJHSSecretManager(
+Configuration conf) {
+  return new JHSDelegationTokenSecretManager(initialInterval, 
+  maxLifetime, renewInterval, 360);
+}
   };
-};
-jobHistoryServer.init(conf);
-jobHistoryServer.start();
-
-// Fake the authentication-method
-UserGroupInformation loggedInUser = UserGroupInformation.getCurrentUser();
-loggedInUser.setAuthenticationMethod(AuthenticationMethod.KERBEROS);
+//  final JobHistoryServer jobHistoryServer = jhServer;
+  jobHistoryServer.init(conf);
+  jobHistoryServer.start();
+  final MRClientProtocol hsService = jobHistoryServer.getClientService()
+  .getClientHandler();
+
+  // Fake the authentication-method
+  UserGroupInformation loggedInUser = UserGroupInformation
+  .createRemoteUser("testrene...@apache.org");
+  Assert.assertEquals("testrenewer", loggedInUser.getShortUserName());
+   // Default realm is APACHE.ORG
+  loggedInUser.setAuthenticationMethod(AuthenticationMethod.KERBEROS);
+
+
+  DelegationToken token = getDelegationToken(loggedInUser, hsService,
+  loggedInUser.getShortUserName());
+  tokenFetchTime = System.currentTimeMillis();
+  LOG.info("Got delegation token at: " + tokenFetchTime);
+
+  // Now try talking to JHS using the delegation token
+  clientUsingDT = getMRClientProtocol(token, jobHistoryServer
+  .getClientService().getBindAddress(), "TheDarkLord", conf);
+
+  GetJobReportRequest jobReportRequest =
+  Records.newRecord(GetJobReportRequest.cl

svn commit: r1424729 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterS

2012-12-20 Thread tgraves
Author: tgraves
Date: Thu Dec 20 21:55:43 2012
New Revision: 1424729

URL: http://svn.apache.org/viewvc?rev=1424729&view=rev
Log:
 MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 
but not MR2 (Sandy Ryza via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1424729&r1=1424728&r2=1424729&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Dec 20 21:55:43 2012
@@ -11,6 +11,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI
 About page (Ravi Prakash via jlowe)
 
+MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in 
+MR1 but not MR2 (Sandy Ryza via tgraves)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java?rev=1424729&r1=1424728&r2=1424729&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
 Thu Dec 20 21:55:43 2012
@@ -175,6 +175,8 @@ public class ClusterStatus implements Wr
 
   }
   
+  public static final int UNINITIALIZED_MEMORY_VALUE = -1;
+  
   private int numActiveTrackers;
   private Collection activeTrackers = new ArrayList();
   private int numBlacklistedTrackers;
@@ -384,6 +386,22 @@ public class ClusterStatus implements Wr
   public JobTrackerStatus getJobTrackerStatus() {
 return status;
   }
+  
+  /**
+   * Returns UNINITIALIZED_MEMORY_VALUE (-1)
+   */
+  @Deprecated
+  public long getMaxMemory() {
+return UNINITIALIZED_MEMORY_VALUE;
+  }
+  
+  /**
+   * Returns UNINITIALIZED_MEMORY_VALUE (-1)
+   */
+  @Deprecated
+  public long getUsedMemory() {
+return UNINITIALIZED_MEMORY_VALUE;
+  }
 
   /**
* Gets the list of blacklisted trackers along with reasons for blacklisting.




svn commit: r1424616 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/

2012-12-20 Thread tgraves
Author: tgraves
Date: Thu Dec 20 18:13:20 2012
New Revision: 1424616

URL: http://svn.apache.org/viewvc?rev=1424616&view=rev
Log:
MAPREDUCE-4856. TestJobOutputCommitter uses same directory as TestJobCleanup 
(Sandy Ryza via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1424616&r1=1424615&r2=1424616&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Dec 20 18:13:20 2012
@@ -32,6 +32,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.
 DelegationTokenRenewal  (Karthik Kambatla via tgraves)
 
+MAPREDUCE-4856. TestJobOutputCommitter uses same directory as 
TestJobCleanup 
+(Sandy Ryza via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java?rev=1424616&r1=1424615&r2=1424616&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java
 Thu Dec 20 18:13:20 2012
@@ -45,7 +45,7 @@ public class TestJobOutputCommitter exte
 
   private static String TEST_ROOT_DIR = new File(System.getProperty(
   "test.build.data", "/tmp")
-  + "/" + "test-job-cleanup").toString();
+  + "/" + "test-job-output-committer").toString();
   private static final String CUSTOM_CLEANUP_FILE_NAME = "_custom_cleanup";
   private static final String ABORT_KILLED_FILE_NAME = "_custom_abort_killed";
   private static final String ABORT_FAILED_FILE_NAME = "_custom_abort_failed";




svn commit: r1424595 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ dev-support/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/s

2012-12-20 Thread tgraves
Author: tgraves
Date: Thu Dec 20 17:27:51 2012
New Revision: 1424595

URL: http://svn.apache.org/viewvc?rev=1424595&view=rev
Log:
MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token. 
DelegationTokenRenewal  (Karthik Kambatla via tgraves)

Removed:

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1424595&r1=1424594&r2=1424595&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Dec 20 17:27:51 2012
@@ -29,6 +29,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4895. Fix compilation failure of org.apache.hadoop.mapred.
 gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
 
+MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.
+DelegationTokenRenewal  (Karthik Kambatla via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml?rev=1424595&r1=1424594&r2=1424595&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/dev-support/findbugs-exclude.xml
 Thu Dec 20 17:27:51 2012
@@ -138,11 +138,6 @@


  
- 
-   
-   
-   
-
  




svn commit: r1424590 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce

2012-12-20 Thread tgraves
Author: tgraves
Date: Thu Dec 20 16:58:07 2012
New Revision: 1424590

URL: http://svn.apache.org/viewvc?rev=1424590&view=rev
Log:
YARN-223. Change processTree interface to work better with native code (Radim 
Kolar via tgraves)

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRConfig.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1424590&r1=1424589&r2=1424590&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu 
Dec 20 16:58:07 2012
@@ -26,6 +26,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0
 (Ravi Prakash via jeagles)
 
+MAPREDUCE-4895. Fix compilation failure of org.apache.hadoop.mapred.
+gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java?rev=1424590&r1=1424589&r2=1424590&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java
 Thu Dec 20 16:58:07 2012
@@ -62,8 +62,7 @@ import org.apache.hadoop.mapreduce.MRCon
 import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.mapreduce.lib.reduce.WrappedReducer;
 import org.apache.hadoop.mapreduce.task.ReduceContextImpl;
-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin.*;
+import org.apache.hadoop.yarn.util.ResourceCalculatorProcessTree;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.Progress;
 import org.apache.hadoop.util.Progressable;
@@ -170,7 +169,7 @@ abstract public class Task implements Wr
   private Iterator currentRecIndexIterator = 
 skipRanges.skipRangeIterator();
 
-  private ResourceCalculatorPlugin resourceCalculator = null;
+  private ResourceCalculatorProcessTree pTree;
   private long initCpuCumulativeTime = 0;
 
   protected JobConf conf;
@@ -373,7 +372,7 @@ abstract public class Task implements Wr
* Return current state of the task. 
* needs to be synchronized as communication thread 
* sends the state every second
-   * @return
+   * @return task state
*/
   synchronized TaskStatus.State getState(){
 return this.taskStatus.getRunState(); 
@@ -559,15 +558,15 @@ abstract public class Task implements Wr
   }
 }
 committer.setupTask(taskContext);
-Class clazz =
-conf.getClass(MRConfig.RESOURCE_CALCULATOR_PLUGIN,
-null, ResourceCalculatorPlugin.class);
-resourceCalculator = ResourceCalculatorPlugin
-.getResourceCalculatorPlugin(clazz, conf);
-LOG.info(" Using ResourceCalculatorPlugin : " + resourceCalculator);
-if (resourceCalculator != null) {
-  initCpuCumulativeTime =
-resourceCalculator.getProcResourceValues().getCumulativeCpuTime();
+Class clazz =
+conf.getClass(MRConfig.RESOURCE_CALCULATOR_PROCESS_TREE,
+null, ResourceCalculatorProcessTree.class);
+pTree = ResourceCalculatorProcessTree
+   

svn commit: r1424501 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

2012-12-20 Thread tgraves
Author: tgraves
Date: Thu Dec 20 14:52:24 2012
New Revision: 1424501

URL: http://svn.apache.org/viewvc?rev=1424501&view=rev
Log:
MAPREDUCE-4895 Fix compilation failure of 
org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators (Dennis Y via 
tgraves)

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1424501&r1=1424500&r2=1424501&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu 
Dec 20 14:52:24 2012
@@ -63,6 +63,9 @@ Release 2.0.3-alpha - Unreleased
 MAPREDUCE-4856. TestJobOutputCommitter uses same directory as
 TestJobCleanup. (Sandy Ryza via tomwhite)
 
+MAPREDUCE-4895. Fix compilation failure of org.apache.hadoop.mapred.
+gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
+
 Release 2.0.2-alpha - 2012-09-07 
 
   INCOMPATIBLE CHANGES




svn commit: r1414876 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-cli

2012-11-28 Thread tgraves
Author: tgraves
Date: Wed Nov 28 19:24:27 2012
New Revision: 1414876

URL: http://svn.apache.org/viewvc?rev=1414876&view=rev
Log:
merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1414876&r1=1414875&r2=1414876&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Nov 28 19:24:27 2012
@@ -452,6 +452,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state
 (jlowe via bobby)
 
+MAPREDUCE-4817. Hardcoded task ping timeout kills tasks localizing large 
+amounts of data (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1414876&r1=1414875&r2=1414876&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 Wed Nov 28 19:24:27 2012
@@ -274,7 +274,6 @@ public class TaskAttemptListenerImpl ext
   @Override
   public boolean ping(TaskAttemptID taskAttemptID) throws IOException {
 LOG.info("Ping from " + taskAttemptID.toString());
-taskHeartbeatHandler.pinged(TypeConverter.toYarn(taskAttemptID));
 return true;
   }
 

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java?rev=1414876&r1=1414875&r2=1414876&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 Wed Nov 28 19:24:27 2012
@@ -46,33 +46,22 @@ import org.apache.hadoop.yarn.service.Ab
 public class TaskHeartbeatHandler extends AbstractService {
   
   private static class ReportTime {
-private long lastPing;
 private long lastProgress;
 
 public ReportTime(long time) {
   setLastProgress(time);
 }
 
-public synchronized void setLastPing(long time) {
-  lastPing = time;
-}
-
 public synchronized void setLastProgress(long time) {
   lastProgress = time;
-  lastPing = time;
-}
-
-public synchronized long getLastPing() {
-  return lastPing;
 }
-
+
 public synchronized long getLastProgress() {
   return lastProgress;
 }
   }
   
   private static final Log LOG = LogFactory.getLog(TaskHeartbeatHandler.class);
-  private static final int PING_TIMEOUT = 5 * 60 * 1000;
   
   //thread which runs periodically to see the last time since a heartbeat is
   //received from a task.
@@ -127,14 +116,6 @@ public class TaskHeartbeatHandler extend
 }
   }
 
-  public void pinged(TaskAttemptId attemptID) {
-//only put for the registered attempts
-  //TODO throw an exception if the task isn't registered.
-  ReportTime time = runningAttempts.get(attemptID);
-  if(time != null) {
-time.setLastPing(c

svn commit: r1414875 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-

2012-11-28 Thread tgraves
Author: tgraves
Date: Wed Nov 28 19:23:52 2012
New Revision: 1414875

URL: http://svn.apache.org/viewvc?rev=1414875&view=rev
Log:
merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1414875&r1=1414874&r2=1414875&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Nov 28 19:23:52 2012
@@ -20,6 +20,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state
 (jlowe via bobby)
 
+MAPREDUCE-4817. Hardcoded task ping timeout kills tasks localizing large 
+amounts of data (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1414875&r1=1414874&r2=1414875&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 Wed Nov 28 19:23:52 2012
@@ -274,7 +274,6 @@ public class TaskAttemptListenerImpl ext
   @Override
   public boolean ping(TaskAttemptID taskAttemptID) throws IOException {
 LOG.info("Ping from " + taskAttemptID.toString());
-taskHeartbeatHandler.pinged(TypeConverter.toYarn(taskAttemptID));
 return true;
   }
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java?rev=1414875&r1=1414874&r2=1414875&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 Wed Nov 28 19:23:52 2012
@@ -46,33 +46,22 @@ import org.apache.hadoop.yarn.service.Ab
 public class TaskHeartbeatHandler extends AbstractService {
   
   private static class ReportTime {
-private long lastPing;
 private long lastProgress;
 
 public ReportTime(long time) {
   setLastProgress(time);
 }
 
-public synchronized void setLastPing(long time) {
-  lastPing = time;
-}
-
 public synchronized void setLastProgress(long time) {
   lastProgress = time;
-  lastPing = time;
-}
-
-public synchronized long getLastPing() {
-  return lastPing;
 }
-
+
 public synchronized long getLastProgress() {
   return lastProgress;
 }
   }
   
   private static final Log LOG = LogFactory.getLog(TaskHeartbeatHandler.class);
-  private static final int PING_TIMEOUT = 5 * 60 * 1000;
   
   //thread which runs periodically to see the last time since a heartbeat is
   //received from a task.
@@ -127,14 +116,6 @@ public class TaskHeartbeatHandler extend
 }
   }
 
-  public void pinged(TaskAttemptId attemptID) {
-//only put for the registered attempts
-  //TODO throw an exception if the task isn't registered.
-  ReportTime time = runningAttempts.get(attemptID);
-

svn commit: r1414873 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-client/hadoop-m

2012-11-28 Thread tgraves
Author: tgraves
Date: Wed Nov 28 19:19:16 2012
New Revision: 1414873

URL: http://svn.apache.org/viewvc?rev=1414873&view=rev
Log:
MAPREDUCE-4817. Hardcoded task ping timeout kills tasks localizing large 
amounts of data (tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1414873&r1=1414872&r2=1414873&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Nov 28 
19:19:16 2012
@@ -601,6 +601,9 @@ Release 0.23.6 - UNRELEASED
 MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state
 (jlowe via bobby)
 
+MAPREDUCE-4817. Hardcoded task ping timeout kills tasks localizing large 
+amounts of data (tgraves)
+
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1414873&r1=1414872&r2=1414873&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
 Wed Nov 28 19:19:16 2012
@@ -274,7 +274,6 @@ public class TaskAttemptListenerImpl ext
   @Override
   public boolean ping(TaskAttemptID taskAttemptID) throws IOException {
 LOG.info("Ping from " + taskAttemptID.toString());
-taskHeartbeatHandler.pinged(TypeConverter.toYarn(taskAttemptID));
 return true;
   }
 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java?rev=1414873&r1=1414872&r2=1414873&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/TaskHeartbeatHandler.java
 Wed Nov 28 19:19:16 2012
@@ -46,33 +46,22 @@ import org.apache.hadoop.yarn.service.Ab
 public class TaskHeartbeatHandler extends AbstractService {
   
   private static class ReportTime {
-private long lastPing;
 private long lastProgress;
 
 public ReportTime(long time) {
   setLastProgress(time);
 }
 
-public synchronized void setLastPing(long time) {
-  lastPing = time;
-}
-
 public synchronized void setLastProgress(long time) {
   lastProgress = time;
-  lastPing = time;
-}
-
-public synchronized long getLastPing() {
-  return lastPing;
 }
-
+
 public synchronized long getLastProgress() {
   return lastProgress;
 }
   }
   
   private static final Log LOG = LogFactory.getLog(TaskHeartbeatHandler.class);
-  private static final int PING_TIMEOUT = 5 * 60 * 1000;
   
   //thread which runs periodically to see the last time since a heartbeat is
   //received from a task.
@@ -127,14 +116,6 @@ public class TaskHeartbeatHandler extend
 }
   }
 
-  public void pinged(TaskAttemptId attemptID) {
-//only put for the registered attempts
-  //TODO throw an exception if the task isn't registered.
-  ReportTime time = runningAttempts.get(attemptID);
-  if(time != null) {
-time.setLastPing(clock.getTime());
-  }
-}
   
   public void register(TaskAttemptId attemptID) {
 runningAttempts.put(attemptID, new Rep

svn commit: r1411470 - /hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

2012-11-19 Thread tgraves
Author: tgraves
Date: Mon Nov 19 22:41:55 2012
New Revision: 1411470

URL: http://svn.apache.org/viewvc?rev=1411470&view=rev
Log:
Preparing 0.23.5 release

Modified:

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411470&r1=1411469&r2=1411470&view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 22:41:55 2012
@@ -105,7 +105,7 @@
   
 
-
   
 




svn commit: r1411442 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2012-11-19 Thread tgraves
Author: tgraves
Date: Mon Nov 19 21:54:42 2012
New Revision: 1411442

URL: http://svn.apache.org/viewvc?rev=1411442&view=rev
Log:
Fixing CHANGES.txt to show jiras in re-branched 0.23.5 release

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1411442&r1=1411441&r2=1411442&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Nov 19 21:54:42 2012
@@ -12,9 +12,6 @@ Release 0.23.6 - UNRELEASED
 
   BUG FIXES
 
-MAPREDUCE-4802. Takes a long time to load the task list on the AM for
-large jobs (Ravi Prakash via bobby)
-
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -123,6 +120,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely
 closed channels (jlowe via bobby)
+
+MAPREDUCE-4802. Takes a long time to load the task list on the AM for
+large jobs (Ravi Prakash via bobby)
  
 Release 0.23.4
 




svn commit: r1411441 - in /hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2012-11-19 Thread tgraves
Author: tgraves
Date: Mon Nov 19 21:53:12 2012
New Revision: 1411441

URL: http://svn.apache.org/viewvc?rev=1411441&view=rev
Log:
Preparing 0.23.5 release

Modified:
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt?rev=1411441&r1=1411440&r2=1411441&view=diff
==
--- hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt 
Mon Nov 19 21:53:12 2012
@@ -1,20 +1,5 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.6 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
-MAPREDUCE-4802. Takes a long time to load the task list on the AM for
-large jobs (Ravi Prakash via bobby)
-
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -123,6 +108,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely
 closed channels (jlowe via bobby)
+
+MAPREDUCE-4802. Takes a long time to load the task list on the AM for
+large jobs (Ravi Prakash via bobby)
  
 Release 0.23.4
 

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411441&r1=1411440&r2=1411441&view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 21:53:12 2012
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.5
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-app
-  0.23.6-SNAPSHOT
+  0.23.5
   hadoop-mapreduce-client-app
 
   

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1411441&r1=1411440&r2=1411441&view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Mon Nov 19 21:53:12 2012
@@ -19,12 +19,12 @@
   
 hadoop-mapreduce-client
 org.apache.hadoop
-0.23.6-SNAPSHOT
+0.23.5
   
   4.0.0
   org.apache.hadoop
   hadoop-mapreduce-client-common
-  0.23.6-SNAPSHOT
+  0.23.5
   hadoop-mapreduce-client-common
 
   

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml?rev=1411441&r1=1411440&r2=1411441&view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
 (original)
+++ 
hadoop/co

svn commit: r1409035 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app

2012-11-13 Thread tgraves
Author: tgraves
Date: Tue Nov 13 23:50:23 2012
New Revision: 1409035

URL: http://svn.apache.org/viewvc?rev=1409035&view=rev
Log:
merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1409035&r1=1409034&r2=1409035&view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue 
Nov 13 23:50:23 2012
@@ -96,6 +96,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by
 default (Ravi Prakash via bobby)
+
+MAPREDUCE-4517. Too many INFO messages written out during AM to RM 
heartbeat
+(Jason Lowe via tgraves)
  
 Release 0.23.4 - UNRELEASED
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1409035&r1=1409034&r2=1409035&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 Tue Nov 13 23:50:23 2012
@@ -62,6 +62,7 @@ import org.apache.hadoop.yarn.api.record
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.ContainerStatus;
 import org.apache.hadoop.yarn.api.records.Priority;
+import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.util.RackResolver;
 
@@ -140,6 +141,8 @@ public class RMContainerAllocator extend
   BlockingQueue eventQueue
 = new LinkedBlockingQueue();
 
+  private ScheduleStats scheduleStats = new ScheduleStats();
+
   public RMContainerAllocator(ClientService clientService, AppContext context) 
{
 super(clientService, context);
 this.stopped = new AtomicBoolean(false);
@@ -203,13 +206,10 @@ public class RMContainerAllocator extend
 
   @Override
   protected synchronized void heartbeat() throws Exception {
-LOG.info("Before Scheduling: " + getStat());
+scheduleStats.updateAndLogIfChanged("Before Scheduling: ");
 List allocatedContainers = getResources();
-LOG.info("After Scheduling: " + getStat());
 if (allocatedContainers.size() > 0) {
-  LOG.info("Before Assign: " + getStat());
   scheduledRequests.assign(allocatedContainers);
-  LOG.info("After Assign: " + getStat());
 }
 
 int completedMaps = getJob().getCompletedMaps();
@@ -230,6 +230,8 @@ public class RMContainerAllocator extend
   maxReduceRampupLimit, reduceSlowStart);
   recalculateReduceSchedule = false;
 }
+
+scheduleStats.updateAndLogIfChanged("After Scheduling: ");
   }
 
   @Override
@@ -240,7 +242,7 @@ public class RMContainerAllocator extend
 }
 eventHandlingThread.interrupt();
 super.stop();
-LOG.info("Final Stats: " + getStat());
+scheduleStats.log("Final Stats: ");
   }
 
   public boolean getIsReduceStarted() {
@@ -422,7 +424,9 @@ public class RMContainerAllocator extend
   return;
 }
 
-LOG.info("Recalculating schedule...");
+int headRoom = getAvailableResources() != null ?
+getAvailableResources().getMemory() : 0;
+LOG.info("Recalculating schedule, headroom=" + headRoom);
 
 //check for slow start
 if (!getIsReduceStarted()) {//not set yet
@@ -531,24 +535,6 @@ public class RMContainerAllocator extend
 }
   }
   
-  /**
-   * Synchronized to avoid findbugs warnings
-   */
-  private synchronized String getStat() {
-return "PendingReduces:" + pendingReduces.size() +
-" ScheduledMaps:" + scheduledRequests.maps.size() +
- 

svn commit: r1409034 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm

2012-11-13 Thread tgraves
Author: tgraves
Date: Tue Nov 13 23:49:04 2012
New Revision: 1409034

URL: http://svn.apache.org/viewvc?rev=1409034&view=rev
Log:
merge -r 1409031:1409032  from trunk. FIXES: MAPREDUCE-4517

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1409034&r1=1409033&r2=1409034&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Nov 13 23:49:04 2012
@@ -513,6 +513,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by
 default (Ravi Prakash via bobby)
+
+MAPREDUCE-4517. Too many INFO messages written out during AM to RM 
heartbeat
+(Jason Lowe via tgraves)
  
 Release 0.23.4 - UNRELEASED
 

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1409034&r1=1409033&r2=1409034&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 Tue Nov 13 23:49:04 2012
@@ -67,6 +67,7 @@ import org.apache.hadoop.yarn.api.record
 import org.apache.hadoop.yarn.api.records.NodeReport;
 import org.apache.hadoop.yarn.api.records.NodeState;
 import org.apache.hadoop.yarn.api.records.Priority;
+import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.util.RackResolver;
 
@@ -145,6 +146,8 @@ public class RMContainerAllocator extend
   BlockingQueue eventQueue
 = new LinkedBlockingQueue();
 
+  private ScheduleStats scheduleStats = new ScheduleStats();
+
   public RMContainerAllocator(ClientService clientService, AppContext context) 
{
 super(clientService, context);
 this.stopped = new AtomicBoolean(false);
@@ -208,13 +211,10 @@ public class RMContainerAllocator extend
 
   @Override
   protected synchronized void heartbeat() throws Exception {
-LOG.info("Before Scheduling: " + getStat());
+scheduleStats.updateAndLogIfChanged("Before Scheduling: ");
 List allocatedContainers = getResources();
-LOG.info("After Scheduling: " + getStat());
 if (allocatedContainers.size() > 0) {
-  LOG.info("Before Assign: " + getStat());
   scheduledRequests.assign(allocatedContainers);
-  LOG.info("After Assign: " + getStat());
 }
 
 int completedMaps = getJob().getCompletedMaps();
@@ -235,6 +235,8 @@ public class RMContainerAllocator extend
   maxReduceRampupLimit, reduceSlowStart);
   recalculateReduceSchedule = false;
 }
+
+scheduleStats.updateAndLogIfChanged("After Scheduling: ");
   }
 
   @Override
@@ -245,7 +247,7 @@ public class RMContainerAllocator extend
 }
 eventHandlingThread.interrupt();
 super.stop();
-LOG.info("Final Stats: " + getStat());
+scheduleStats.log("Final Stats: ");
   }
 
   public boolean getIsReduceStarted() {
@@ -427,7 +429,9 @@ public class RMContainerAllocator extend
   return;
 }
 
-LOG.info("Recalculating schedule...");
+int headRoom = getAvailableResources() != null ?
+getAvailableResources().getMemory() : 0;
+LOG.info("Recalculating schedule, headroom=" + headRoom);
 
 //check for slow start
 if (!getIsReduceStarted()) {//not set yet
@@ -536,24 +540,6 @@ public class RMContainerAllocator extend
 }
   }
   
-  /**
-   * Synchronized to avoid findbugs warnings
-   */
-  private synchronized String getStat() {
-return "PendingReduces:" + pendingReduces.size() +
-" ScheduledMaps:" + scheduledRequests.maps.size() +
-" ScheduledReduces:" + scheduledRequests.reduc

svn commit: r1409032 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainer

2012-11-13 Thread tgraves
Author: tgraves
Date: Tue Nov 13 23:47:57 2012
New Revision: 1409032

URL: http://svn.apache.org/viewvc?rev=1409032&view=rev
Log:
MAPREDUCE-4517. Too many INFO messages written out during AM to RM heartbeat 
(Jason Lowe via tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1409032&r1=1409031&r2=1409032&view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Nov 13 
23:47:57 2012
@@ -660,6 +660,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by
 default (Ravi Prakash via bobby)
+
+MAPREDUCE-4517. Too many INFO messages written out during AM to RM 
heartbeat
+(Jason Lowe via tgraves)
  
 Release 0.23.4 - UNRELEASED
 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1409032&r1=1409031&r2=1409032&view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
 Tue Nov 13 23:47:57 2012
@@ -67,6 +67,7 @@ import org.apache.hadoop.yarn.api.record
 import org.apache.hadoop.yarn.api.records.NodeReport;
 import org.apache.hadoop.yarn.api.records.NodeState;
 import org.apache.hadoop.yarn.api.records.Priority;
+import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.apache.hadoop.yarn.util.RackResolver;
 
@@ -145,6 +146,8 @@ public class RMContainerAllocator extend
   BlockingQueue eventQueue
 = new LinkedBlockingQueue();
 
+  private ScheduleStats scheduleStats = new ScheduleStats();
+
   public RMContainerAllocator(ClientService clientService, AppContext context) 
{
 super(clientService, context);
 this.stopped = new AtomicBoolean(false);
@@ -208,13 +211,10 @@ public class RMContainerAllocator extend
 
   @Override
   protected synchronized void heartbeat() throws Exception {
-LOG.info("Before Scheduling: " + getStat());
+scheduleStats.updateAndLogIfChanged("Before Scheduling: ");
 List allocatedContainers = getResources();
-LOG.info("After Scheduling: " + getStat());
 if (allocatedContainers.size() > 0) {
-  LOG.info("Before Assign: " + getStat());
   scheduledRequests.assign(allocatedContainers);
-  LOG.info("After Assign: " + getStat());
 }
 
 int completedMaps = getJob().getCompletedMaps();
@@ -235,6 +235,8 @@ public class RMContainerAllocator extend
   maxReduceRampupLimit, reduceSlowStart);
   recalculateReduceSchedule = false;
 }
+
+scheduleStats.updateAndLogIfChanged("After Scheduling: ");
   }
 
   @Override
@@ -245,7 +247,7 @@ public class RMContainerAllocator extend
 }
 eventHandlingThread.interrupt();
 super.stop();
-LOG.info("Final Stats: " + getStat());
+scheduleStats.log("Final Stats: ");
   }
 
   public boolean getIsReduceStarted() {
@@ -427,7 +429,9 @@ public class RMContainerAllocator extend
   return;
 }
 
-LOG.info("Recalculating schedule...");
+int headRoom = getAvailableResources() != null ?
+getAvailableResources().getMemory() : 0;
+LOG.info("Recalculating schedule, headroom=" + headRoom);
 
 //check for slow start
 if (!getIsReduceStarted()) {//not set yet
@@ -536,24 +540,6 @@ public class RMContainerAllocator extend
 }
   }
   
-  /**
-   * Synchronized to avoid findbugs warnings
-   */
-  private synchronized String getStat() {
-return "PendingReduces:" + pendingReduces.size() +
-" ScheduledMaps:" + scheduledRequests.maps.size() +
-" ScheduledReduces:" + scheduledRequests.reduces.size() +
-" AssignedMaps:" + assignedRequests.maps.si

svn commit: r1404182 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/ hadoop-mapreduce-cli

2012-10-31 Thread tgraves
Author: tgraves
Date: Wed Oct 31 15:02:59 2012
New Revision: 1404182

URL: http://svn.apache.org/viewvc?rev=1404182&view=rev
Log:
merge -r 1404176:1404177  from trunk. FIXES: MAPREDUCE-4752

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskImpl.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobProfile.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskStatus.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TaggedInputSplit.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobStatus.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/QueueAclsInfo.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/QueueInfo.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/TaskReport.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounterGroup.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/GenericCounter.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1404182&r1=1404181&r2=1404182&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Oct 31 15:02:59 2012
@@ -434,6 +434,9 @@ Release 0.23.5 - UNRELEASED
 MAPREDUCE-4596. Split StateMachine state from states seen by 
MRClientProtocol
 for Job, Task and TaskAttempt. (Siddarth Seth via vinodkv) 
 
+MAPREDUCE-4752. Reduce MR AM memory usage through String Interning (Robert
+Evans via tgraves)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1404182&r1=1404181&

  1   2   3   >