Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,525 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

625 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli d8ed9ef4b8 MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1524856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524857 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 22:36:58 +00:00
Sanford Ryza f0e79b8157 MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 13:58:37 +00:00
Arun Murthy 73c69decf1 Merge -c 1523660 from trunk to branch-2 to fix MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523661 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:19:33 +00:00
Alejandro Abdelnur 7993c89ea8 MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523607 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 12:20:30 +00:00
Thomas Graves a574ef2864 MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521584 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-10 18:53:29 +00:00
Alejandro Abdelnur 23cbe7af90 MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518773 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 19:26:31 +00:00
Vinod Kumar Vavilapalli 83c4906a2e MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1516238 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:18:13 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 10:13:17 +00:00
Jason Darrell Lowe 6f27db80ac svn merge -c 1515863 FIXES: MAPREDUCE-5001. LocalJobRunner has race condition resulting in job failures. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515877 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 17:00:06 +00:00
Sanford Ryza 0c32694b27 MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of indexes for better cache performance. (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514610 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 08:14:58 +00:00
Sanford Ryza 2a7293a254 MAPREDUCE-434. LocalJobRunner limited to single reducer (Sandy Ryza and Aaron Kimball via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510867 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-06 06:40:42 +00:00
Sanford Ryza 75c40235aa MAPREDUCE-5399. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510813 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 23:35:03 +00:00
Siddharth Seth d7f082ad5f merge MAPREDUCE-5352 from trunk. Optimize node local splits generated by CombineFileInputFormat. (sseth) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509346 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 17:43:40 +00:00
Vinod Kumar Vavilapalli d00dcbd2f5 MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1508595 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508596 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-30 20:05:19 +00:00
Jason Darrell Lowe f6611d89c8 svn merge -c 1507385 FIXES: MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus. Contributed by Hairong Kuang and Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507387 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 18:22:00 +00:00
Jason Darrell Lowe b11cceb25c svn merge -c 1507104 FIXES: MAPREDUCE-5251. Reducer should not implicate map attempt if it has insufficient space to fetch map output. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507105 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-25 19:45:20 +00:00
Alejandro Abdelnur 98eb429771 MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506759 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 22:33:59 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 01:35:34 +00:00
Jason Darrell Lowe 9b1bc20045 svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 20:47:58 +00:00
Chris Nauroth 9bd8745846 MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-10 23:08:34 +00:00
Chris Nauroth 8c10908e1e MAPREDUCE-5357. Merging change r1499210 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499217 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 05:37:34 +00:00
Jason Darrell Lowe 199485bcdf svn merge -c 1499125 FIXES: MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir. Contributed by Devaraj K 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499127 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 22:00:43 +00:00
Arun Murthy 2977cbfc83 Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496742 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-26 05:50:23 +00:00
Christopher Douglas 6267cddbd6 MAPREDUCE-5194. Heed interrupts during Fetcher shutdown. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494417 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 02:12:20 +00:00
Jason Darrell Lowe 20a950a374 MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal task-state. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494292 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 20:39:56 +00:00
Arun Murthy 51bb83eabf Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 19:10:32 +00:00
Arun Murthy a00e4a926d Merge -c 1493445 from trunk to branch-2 to fix MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493446 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 03:07:56 +00:00
Arun Murthy 451f725b92 Merge -c 1492962 from trunk to branch-2 to fix MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492963 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 06:27:38 +00:00
Jason Darrell Lowe 85543c3683 MAPREDUCE-4019. -list-attempt-ids is not working. Contributed by Ashwin Shankar, Devaraj K, and B Anil Kumar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492877 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 21:35:34 +00:00
Vinod Kumar Vavilapalli 027f71eb05 MAPREDUCE-5199. Removing ApplicationTokens file as it is no longer needed. Contributed by Daryn Sharp. 
svn merge --ignore-ancestry -c 1492848 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492849 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 20:21:03 +00:00
Chris Nauroth 87c96a022e MAPREDUCE-5259. Merging change r1492364 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492367 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 19:00:05 +00:00
Alejandro Abdelnur 3af49516ca MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents methods have incompatible signature changes. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492362 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 18:50:46 +00:00
Jason Darrell Lowe 12f72e0ba6 svn merge -c 1491611 FIXES: MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching multiple compressed map outputs. Contributed by Nathan Roberts 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491614 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 21:45:35 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 15:34:52 +00:00
Arun Murthy 620c7fe36f Merge -c 1489236 from trunk to branch-2 to fix MAPREDUCE-5245. Added back constants to JobConf to fix incompatibilities. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489237 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:57:08 +00:00
Arun Murthy 6edd290758 Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:43:14 +00:00
Arun Murthy 1d77b6c417 Merge -c 1489219 from trunk to branch-2 to fix MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489220 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 22:55:22 +00:00
Arun Murthy 89a1e48cd7 Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489188 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 21:35:33 +00:00
Thomas White f3c4f2b3e2 Merge -r 1489059:1489060 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489061 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 16:55:51 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 02:36:44 +00:00
Vinod Kumar Vavilapalli 17476d2fa7 MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488625 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488626 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:22:27 +00:00
Vinod Kumar Vavilapalli 3de04e6401 MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488621 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488623 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:12:25 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Vinod Kumar Vavilapalli 4e0ac70cea MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488458 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488459 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 03:59:23 +00:00
Vinod Kumar Vavilapalli 089b3edd0e MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488442 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488443 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:34:24 +00:00
Vinod Kumar Vavilapalli 75a96a140a MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488436 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488437 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 23:57:42 +00:00
Vinod Kumar Vavilapalli 297e916f41 MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488370 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 19:48:30 +00:00
Christopher Douglas 1711348e48 MAPREDUCE-5176. Add annotation for tagging tasks as responsive to 
preemption. Contributed by Carlo Curino, cdouglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 06:07:37 +00:00
Vinod Kumar Vavilapalli 1a8872e1e0 MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli a099537780 YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth. 
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 20:19:53 +00:00
Vinod Kumar Vavilapalli 6cb1cf3d1a MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1487695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli 71cc411340 MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen. 
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 00:43:47 +00:00
Suresh Srinivas 599b00e087 MAPREDUCE-5191. Merge r1484575 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:47:19 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:29:49 +00:00
Vinod Kumar Vavilapalli 004a9d5567 MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1485906 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:42:53 +00:00
Vinod Kumar Vavilapalli 35dc9545e1 YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal. 
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 18:02:45 +00:00
Vinod Kumar Vavilapalli 28822c2f64 MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1485491 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 23:13:19 +00:00
Vinod Kumar Vavilapalli 89f809bdff MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1484992 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484993 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 22:01:02 +00:00
Vinod Kumar Vavilapalli d180262cf9 MAPREDUCE-5234. Change mapred.TaskReport and mapreduce.TaskReport for binary compatibility with mapred in 1.x but incompatible with 0.23.x. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1483940 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 18:17:57 +00:00
Alejandro Abdelnur 2ed6ce3bfb MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 22:14:15 +00:00
Vinod Kumar Vavilapalli 44a9273286 MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1482208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 05:52:46 +00:00
Alejandro Abdelnur 7db8233722 MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482143 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 23:09:05 +00:00
Vinod Kumar Vavilapalli 621db3a3cc MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1481657 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481658 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-12 21:59:48 +00:00
Alejandro Abdelnur c56c50df3f MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 20:11:33 +00:00
Vinod Kumar Vavilapalli 4a0965323c MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1480474 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480476 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:43:40 +00:00
Christopher Douglas 5cf0e57849 MAPREDUCE-5209. Fix units in a ShuffleScheduler log message. 
Contributed by Tsuyoshi OZAWA


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480472 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:36:43 +00:00
Vinod Kumar Vavilapalli 2f7c04f53a MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1480394 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 18:29:10 +00:00
Thomas White 0411165008 Merge -r 1478421:1478422 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478424 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 16:00:15 +00:00
Vinod Kumar Vavilapalli 868362c9b1 MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1477889 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 00:44:13 +00:00
Arun Murthy 1fb58d2322 Merge -c 1471556 from trunk to branch-2 to fix MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471557 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 17:39:28 +00:00
Robert Joseph Evans 8b23e7e10c svn merge -c 1471424 FIXES: MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471429 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:23:00 +00:00
Vinod Kumar Vavilapalli 2dfecb78e5 YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong. 
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:01:08 +00:00
Arun Murthy b65a090174 Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 19:19:16 +00:00
Alejandro Abdelnur d516caf788 MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469589 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 21:43:59 +00:00
Alejandro Abdelnur df24059512 MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469524 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 18:53:36 +00:00
Alejandro Abdelnur 9b4f1a0c10 MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469096 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 23:15:22 +00:00
Thomas Graves fd6956c3bd MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468484 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 16:12:25 +00:00
Robert Joseph Evans a7fba8fcd7 svn merge -c 1468232 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468235 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-15 21:36:31 +00:00
Vinod Kumar Vavilapalli 0c54bb343d MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1467124 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467126 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 22:55:52 +00:00
Siddharth Seth 422133edf7 merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 05:02:45 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 03:16:30 +00:00
Arun Murthy b66abebca2 Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-06 05:33:41 +00:00
Konstantin Boudnik 347d9f6b98 MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464147 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-03 18:35:31 +00:00
Robert Joseph Evans ca4b6ee8c6 Reverted MAPREDUCE-4974 because of test failures. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:15:08 +00:00
Robert Joseph Evans f47bdbded7 svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 17:47:19 +00:00
Siddharth Seth 6e9e2f0c7f MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 18:18:44 +00:00
Robert Joseph Evans 4bc46b766d svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 14:17:59 +00:00
Vinod Kumar Vavilapalli 7410551629 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1460923 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 22:34:45 +00:00
Alejandro Abdelnur 35bc29813f Reverting MAPREDUCE-5028 (commit 1457919) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 18:00:38 +00:00
Jonathan Turner Eagles 3fdeec0bd3 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 15:48:36 +00:00
Alejandro Abdelnur 1036f637cc MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 18:59:22 +00:00
Robert Joseph Evans 9a9d40200f svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-15 21:11:45 +00:00
Jason Darrell Lowe 77e23898f1 svn merge -c 1455740 FIXES: MAPREDUCE-5060. Fetch failures that time out only count against the first map task. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455742 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 22:56:57 +00:00
Arun Murthy 851a425b2a Merge -c 1453365 from trunk to branch-2 to fix MAPREDUCE-3685. Fix bugs in MergeManager to ensure compression codec is appropriately used and that on-disk segments are correctly sorted on file-size. Contributed by Anty Rao and Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453367 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 15:03:29 +00:00
Jonathan Turner Eagles ea7aa7f80f MAPREDUCE-5027. Shuffle does not limit number of outstanding connections (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453099 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 00:07:25 +00:00
Alejandro Abdelnur 9db8505b19 HADOOP-9349. Confusing output when running hadoop version from one hadoop installation when HADOOP_HOME points to another. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451449 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-01 01:21:30 +00:00
Jonathan Turner Eagles 07680cdb13 MAPREDUCE-4871. AM uses mapreduce.jobtracker.split.metainfo.maxsize but mapred-default has mapreduce.job.split.metainfo.maxsize (Jason Lowe via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451319 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-28 19:57:10 +00:00
Siddharth Seth b775d49f35 merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 21:04:29 +00:00
Vinod Kumar Vavilapalli c3981d3f2c MAPREDUCE-4892. Modify CombineFileInputFormat to not skew input slits' allocation on small clusters. Contributed by Bikas Saha. 
svn merge --ignore-ancestry -c 1450912 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450915 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 18:53:03 +00:00
Thomas White 7b943682fb Merge -r 1450722:1450723 from trunk to branch-2. Fixes: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450724 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 10:40:52 +00:00
Thomas White a9f552cb33 Merge -r 1448601:1448602 from trunk to branch-2. Fixes: MAPREDUCE-5013. mapred.JobStatus compatibility: MR2 missing constructors from MR1. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448604 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 11:44:50 +00:00
Thomas White af07edf1ab Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 11:36:26 +00:00
Jason Darrell Lowe e3924c623f svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 02:17:24 +00:00
Jason Darrell Lowe 2db13d61c2 svn merge -c 1443257 FIXES: MAPREDUCE-4822. Unnecessary conversions in History Events. Contributed by Chu Tong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443269 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 22:58:09 +00:00
Alejandro Abdelnur f5503bd44a MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:53:06 +00:00
Robert Joseph Evans dcbad333ad svn merge -c 1443027. FIXES: MAPREDUCE-4905. test org.apache.hadoop.mapred.pipes (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443033 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 15:57:46 +00:00
Arun Murthy 196341fc09 Setting version to 2.0.4-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 13:23:45 +00:00
Siddharth Seth 392a96bd64 merge MAPREDUCE-4971 from trunk. Minor extensibility enhancements to Counters & FileOutputFormat. Contributed by Arun C Murthy 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441672 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 00:49:17 +00:00
Alejandro Abdelnur 1cc2fcd3b2 MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440080 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 19:40:20 +00:00
Siddharth Seth 6f146b15d3 merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 00:23:27 +00:00
Alejandro Abdelnur 26e597010f Reverting MAPREDUCE-2264 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-28 18:59:32 +00:00
Alejandro Abdelnur 7ac9d3b1c5 MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:50:17 +00:00
Alejandro Abdelnur d8cdee8360 MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:41:12 +00:00
Alejandro Abdelnur cf67cccd7c MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:40:21 +00:00
Alejandro Abdelnur 7a6b9f3609 MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:39:27 +00:00
Alejandro Abdelnur c4c039bb29 MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-26 00:38:38 +00:00
Jonathan Turner Eagles 361e05864f svn merge -c 1435386 FIXES: MAPREDUCE-4458. Warn if java.library.path is used for AM or Task (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435394 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 22:47:14 +00:00
Alejandro Abdelnur 1d6bd54e29 MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434994 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 00:41:26 +00:00
Thomas Graves fdc4c61101 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 15:01:35 +00:00
Robert Joseph Evans 63106e20e0 svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-11 19:05:02 +00:00
Alejandro Abdelnur 4774c6a5b8 MAPREDUCE-4907. Ammendment, forgot to svn add testcase in original commit 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431511 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 17:28:27 +00:00
Alejandro Abdelnur 572f7f45d6 MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-10 00:52:15 +00:00
Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 16:22:55 +00:00
Vinod Kumar Vavilapalli 76939f2877 MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen. 
svn merge --ignore-ancestry -c 1430707 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 06:33:01 +00:00
Arun Murthy 122cd0fb5b Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 05:31:53 +00:00
Thomas White 75878f6c7b Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 16:31:58 +00:00
Robert Joseph Evans 199df2b770 svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:38:36 +00:00
Thomas Graves 2cb090a075 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:31:22 +00:00
Jason Darrell Lowe ec4fc07c52 svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 19:27:56 +00:00
Robert Joseph Evans 52742c9a65 svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-28 15:06:15 +00:00
Jason Darrell Lowe 7bec80179b svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-26 20:49:39 +00:00
Luke Lu 307a46f6be MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant. (Yu Gao via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425179 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-21 23:08:54 +00:00
Jason Darrell Lowe 891e616d51 svn merge -c 1425071 FIXES: MAPREDUCE-4842. Shuffle race can hang reducer. Contributed by Mariappan Asokan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425074 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-21 18:32:57 +00:00
Luke Lu 8636b12e35 YARN-223. Update process tree instead of getting new process trees. (Radim Kolar via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424242 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-20 00:19:40 +00:00
Thomas White 01c5d0eb77 Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-18 15:25:09 +00:00
Alejandro Abdelnur 680b437f2f MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 19:29:18 +00:00
Alejandro Abdelnur 63d27f591c MAPREDUCE-4800. Cleanup o.a.h.mapred.MapTaskStatus - remove unused code. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410701 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-17 06:16:58 +00:00
Eli Collins 3bc91c97cb MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-15 00:17:17 +00:00
Robert Joseph Evans 32850b486b svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 20:38:55 +00:00
Robert Joseph Evans b3c28a5753 svn merge -c 1408355 FIXES: MAPREDUCE-4787. TestJobMonitorAndPrint is broken (Rob Parker via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408357 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 17:07:22 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 13:57:19 +00:00
Robert Joseph Evans 82ccfb726a svn merge -c 1407505 FIXES: MAPREDUCE-4782. NLineInputFormat skips first line of last InputSplit (Mark Fuhs via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407506 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-09 15:53:52 +00:00
Robert Joseph Evans 6b3db6eabd svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-08 15:21:36 +00:00
Robert Joseph Evans cb0f68cc3f svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-05 22:16:51 +00:00
Robert Joseph Evans d9e5740ce7 svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-01 17:07:24 +00:00
Thomas Graves b958fa85a5 merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-31 15:02:59 +00:00
Alejandro Abdelnur d3e2e2cb68 MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-30 05:52:17 +00:00
Vinod Kumar Vavilapalli 79a14bb25f MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe. 
svn merge --ignore-ancestry -c 1401941 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-25 01:27:17 +00:00
Daryn Sharp 7b36e659c1 svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-23 21:10:17 +00:00
Robert Joseph Evans 0f4838ab6b svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-16 22:00:51 +00:00
Arun Murthy 267bfc5ff2 Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-11 17:22:27 +00:00
Harsh J 9a0f100130 MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-09 13:41:45 +00:00
Arun Murthy e619da2136 Reverted MAPREDUCE-4253 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-26 18:43:17 +00:00
Thomas White 9e1860bfbf Merge -r 1384832:1384833 from trunk to branch-2. Fixes: HADOOP-8780. Update DeprecatedProperties apt file. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384835 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-14 16:15:20 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 12:57:48 +00:00
Arun Murthy b9a3f51dcd Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-07 04:59:20 +00:00
Jonathan Turner Eagles a64a30ce6c svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-31 21:31:23 +00:00
Robert Joseph Evans 8ef7e47241 svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-31 20:39:03 +00:00
Robert Joseph Evans 0fb6e7626f HADOOP-8726. The Secrets in Credentials are not available to MR tasks (daryn and Benoy Antony via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379105 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-30 19:59:53 +00:00
Thomas White 9f94b89742 Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-30 17:14:07 +00:00
Alejandro Abdelnur 2ff2b79e33 MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-24 23:38:21 +00:00
Robert Joseph Evans bc5f02bac0 svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-23 18:07:59 +00:00
Alejandro Abdelnur 6e831b0f5e MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-23 00:24:36 +00:00
Robert Joseph Evans 1ee0c23b39 svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 17:47:08 +00:00
Robert Joseph Evans f3f8edbd10 svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 15:21:30 +00:00
Daryn Sharp a8f10869a8 svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-17 16:26:01 +00:00
Thomas White 832e7c6dc3 Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 13:27:24 +00:00
Tsz-wo Sze 1294ad1df7 svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 01:42:16 +00:00
Alejandro Abdelnur fc783dcc1e MAPREDUCE-4511. Add IFile readahead (ahmed via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-15 23:11:00 +00:00
Alejandro Abdelnur b344870bdd HADOOP-8681. add support for HTTPS to the web UIs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 21:56:31 +00:00
Thomas Graves 6f516ea1bf merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 21:50:21 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-31 19:21:27 +00:00
Thomas Graves 4850bf623c merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-27 01:48:54 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-26 13:25:41 +00:00
Thomas Graves dce4a7c765 merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 19:28:43 +00:00
Thomas Graves 45c42817ca svn merge --change -1363455 for reverting MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-20 20:21:09 +00:00
Thomas Graves 5568bf8260 merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-19 18:22:03 +00:00
Robert Joseph Evans f8bd54b16a svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-17 19:15:30 +00:00
Robert Joseph Evans 3260960be3 svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-13 20:45:05 +00:00
Harsh J f457ffb05b Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-13 15:23:09 +00:00
Robert Joseph Evans 75af3cba6b svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-12 15:53:38 +00:00
Harsh J 91472c5539 Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-11 15:07:34 +00:00
Alejandro Abdelnur 3097c15d9d Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-09 19:19:42 +00:00
Harsh J 41553468b1 Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-09 02:02:53 +00:00
Harsh J b035a14d58 Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-08 17:24:38 +00:00
Thomas Graves ca78b62579 merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-05 21:37:53 +00:00
Robert Joseph Evans 93f425a659 svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-05 18:10:51 +00:00
Alejandro Abdelnur c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-05 16:33:34 +00:00
Harsh J f62de1d81e svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-30 17:11:46 +00:00
Alejandro Abdelnur 0b4c8a5875 Reverting MAPREDUCE-4346 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-27 18:33:38 +00:00
Alejandro Abdelnur df2f723a75 Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-25 22:01:01 +00:00
Alejandro Abdelnur d21c6aa52f Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-25 21:37:14 +00:00
Robert Joseph Evans f63255faec svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-20 21:32:21 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-11 23:16:08 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-11 13:57:15 +00:00
Thomas Graves c59349ede3 merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-04 15:15:13 +00:00
Harsh J 4200fa906e svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-29 16:15:25 +00:00
Thomas White 5e473c9c6e Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-29 14:45:25 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-28 14:58:13 +00:00
Robert Joseph Evans 1586e827ed i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-21 19:07:13 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-16 19:46:30 +00:00
Thomas White dc576b9fa1 Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-11 15:04:24 +00:00
Robert Joseph Evans c35e442b1b svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-08 15:26:11 +00:00
Robert Joseph Evans 4bc2774d79 svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-08 15:10:03 +00:00
Thomas White f1e31ebaf2 Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-07 19:07:29 +00:00
Thomas White e5e15fab74 Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-26 18:48:13 +00:00
Thomas Graves f8f390b83d merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-24 13:07:22 +00:00
Robert Joseph Evans 1ea39ddc3c svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-23 15:28:19 +00:00
Robert Joseph Evans 0c244e8703 svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-19 20:36:47 +00:00
Robert Joseph Evans 8f4c3499f5 svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-19 20:24:45 +00:00
Robert Joseph Evans eec2fd9f74 MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-19 19:33:04 +00:00
Thomas Graves 7221ae82e5 merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-19 14:54:03 +00:00
Robert Joseph Evans 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-18 18:48:20 +00:00
Robert Joseph Evans 45b2835e9f svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-17 22:13:52 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-13 13:46:45 +00:00
Robert Joseph Evans f9e39d057e svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-09 21:54:22 +00:00
Thomas Graves 93af1a43be merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-04 14:18:55 +00:00
Robert Joseph Evans e76f7b7330 svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-03 18:03:18 +00:00
Thomas Graves ad9f93f7b5 merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-02 20:24:46 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-28 07:25:51 +00:00
Harsh J 92f06cb446 svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-26 13:31:08 +00:00
Todd Lipcon 4ab173a9d4 MAPREDUCE-3992. Reduce fetcher doesn't verify HTTP status code of response. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302755 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-20 02:29:01 +00:00
Vinod Kumar Vavilapalli 07e7ad5e86 MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans. 
svn merge --ignore-ancestry -c 1299047 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-09 21:14:28 +00:00
Robert Joseph Evans de89bbcb88 svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-06 23:23:25 +00:00
Alejandro Abdelnur a7899dae53 Merge -r 1297292:1297293 from trunk to branch. FIXES: MAPREDUCE-3952 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297299 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-06 00:00:36 +00:00
Vinod Kumar Vavilapalli f942f395c1 MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe. 
svn merge --ignore-ancestry -c 1296721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-03 23:42:39 +00:00
Thomas White 100d542625 Merge -r 1296522:1296523 from trunk to branch-23. Fixes: MAPREDUCE-3935. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296524 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-03 00:12:55 +00:00
Siddharth Seth c471c3d15f merge MAPREDUCE-3903 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295263 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-29 20:50:02 +00:00
Thomas Graves 90c6dd8468 merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-29 15:51:55 +00:00
Vinod Kumar Vavilapalli 7808418f74 MAPREDUCE-2855. Passing a cached class-loader to ResourceBundle creator to minimize counter names lookup time. Contributed by Siddarth Seth. 
svn merge --ignore-ancestry -c 1294436 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294437 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-28 01:25:46 +00:00
Vinod Kumar Vavilapalli 3904d62d18 MAPREDUCE-3686. Fixed two bugs in Counters because of which web app displays zero counter values for framework counters. Contributed by Bhallamudi Venkata Siva Kamesh. 
svn merge --ignore-ancestry -c 1293775 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293776 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-26 08:33:34 +00:00
Vinod Kumar Vavilapalli 2b28bb962a MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha. 
svn merge --ignore-ancestry -c 1293517 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 02:07:19 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 01:58:06 +00:00
Tsz-wo Sze 1d00ed1ffc svn merge -c 1245828 from trunk for MAPREDUCE-3583. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245831 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-18 01:15:48 +00:00
Robert Joseph Evans 84595f7640 svn merge -c 1245099 from trunk to 0.23 FIXES MAPREDUCE-3849 Change TokenCache's reading of the binary token file (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245102 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-16 17:57:08 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-08 08:12:18 +00:00
Siddharth Seth 5b31bee4d8 merge MAPREDUCE-3822 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241723 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-08 00:57:36 +00:00
Arun Murthy 1e20db389c Merge -c 1241711 from trunk to branch-0.23 to fix MAPREDUCE-3827. Changed Counters to use ConcurrentSkipListMap for performance. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241712 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-08 00:17:33 +00:00
Siddharth Seth d60facd919 merge MAPREDUCE-3436 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241621 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-07 20:56:15 +00:00
Arun Murthy cea037f414 Merge -c 1241319 from trunk to branch-0.23 to fix MAPREDUCE-3697. Support binary compatibility for Counters after MAPREDUCE-901. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241321 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-07 01:42:29 +00:00
Mahadev Konar 8aa0153373 MAPREDUCE-3794. Support mapred.Task.Counter and mapred.JobInProgress.Counter enums for compatibility (Tom White via mahadev) - Merging r1241299 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241300 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-07 00:55:46 +00:00
Arun Murthy c1596a6c3b Merge -c 1241285 from trunk to branch-0.23 to fix PREDUCE-3811. Made jobclient-to-AM retries configurable. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241286 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-07 00:21:19 +00:00
Arun Murthy c6356556be Merge -c 1241282 from trunk to branch-0.23 to fix MAPREDUCE-3809. Ensure that there is no needless sleep in Task at the end of the task. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241283 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-07 00:14:44 +00:00
Vinod Kumar Vavilapalli 15c308d948 MAPREDUCE-3808. Fixed an NPE in FileOutputCommitter for jobs with maps but no reduces. Contributed by Robert Joseph Evans. 
svn merge --ignore-ancestry -c 1241217 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241218 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-06 22:17:18 +00:00
Mahadev Konar 7fcab49694 MAPREDUCE-3795. "job -status" command line output is malformed. (vinodkv via mahadev) - Merging r1240593 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240594 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 19:35:35 +00:00
Vinod Kumar Vavilapalli 4affe6d979 MAPREDUCE-3711. Fixed MR AM recovery so that only single selected task output is recovered and thus reduce the unnecessarily bloated recovery time. Contributed by Robert Joseph Evans. 
svn merge --ignore-ancestry -c 1240413 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240414 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 00:06:24 +00:00
Alejandro Abdelnur 2c20d0a547 Merge -r 1240409:1240410 from trunk to branch. FIXES: MAPREDUCE-3727 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240411 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 23:53:09 +00:00
Arun Murthy 818dfb0c5b Merge -c 1239482 from trunk to branch-0.23 to fix MAPREDUCE-3771. Un-deprecated the old mapred apis, port of MAPREDUCE-1735. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239484 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 08:39:43 +00:00
Siddharth Seth feacd4ee5d merge MAPREDUCE-3744 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239434 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 01:45:00 +00:00
Siddharth Seth 5254328035 merge MAPREDUCE-3640 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239403 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 23:34:52 +00:00
Mahadev Konar 4c38e6aa9b MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev) - Merging r1239310 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239312 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 20:45:33 +00:00
Alejandro Abdelnur 239604718b Merge -r 1239206:1239207 from trunk to branch. FIXES: MAPREDUCE-3499 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239210 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 17:09:54 +00:00
Thomas White 000141d77c Merge -r 1238733:1238734 from trunk to branch-0.23. Fixes: MAPREDUCE-3749 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238735 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 18:32:29 +00:00
Arun Murthy 85520b1bc4 Merge -c 1238721 from trunk to branch-0.23 to fix MAPREDUCE-3756. Made single shuffle limit configurable. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238723 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 18:09:39 +00:00
Arun Murthy 599264116d Merge -c 1236594 from trunk to branch-0.23 to fix MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236596 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 08:50:24 +00:00
Arun Murthy f1b833c8a3 Merge -c 1236588 from trunk to branch-0.23 to fix MAPREDUCE-3720. Changed bin/mapred job -list to not print job-specific information not available at RM. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236589 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 08:45:24 +00:00
Vinod Kumar Vavilapalli 981ba68664 MAPREDUCE-3699. Increased RPC handlers for all YARN servers to reasonable values for working at scale. Contributed by Hitesh Shah. 
svn merge --ignore-ancestry -c 1236396 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236398 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 21:38:31 +00:00
Siddharth Seth 82c1a407d5 merge MAPREDUCE-3718 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236360 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 19:31:49 +00:00
Arun Murthy 10a3c56fcf Merge -c 1236041 from trunk to branch-0.23 to fix MAPREDUCE-3721. Fixed a race in shuffle which caused reduces to hang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236042 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 05:41:17 +00:00
Vinod Kumar Vavilapalli c516cc863a MAPREDUCE-3714. Fixed EventFetcher and Fetcher threads to shut-down properly so that reducers don't hang in corner cases. (vinodkv) 
svn merge --ignore-ancestry -c 1235545 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235546 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 23:18:46 +00:00
Vinod Kumar Vavilapalli 0bf9779489 MAPREDUCE-3710. Improved FileInputFormat to return better locality for the last split. Contributed by Siddarth Seth. 
svn merge --ignore-ancestry -c 1235510 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235511 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 21:30:48 +00:00
Mahadev Konar cfff5ff7f4 MAPREDUCE-3646. Remove redundant URL info from "mapred job" output. (Jonathan Eagles via mahadev) - Merging r1235034 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235042 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 22:34:44 +00:00
Arun Murthy d36e002fea Merge -c 1232314 from trunk to branch-0.23 to fix MAPREDUCE-2450. MAPREDUCE-2450. Fixed a corner case with interrupted communication threads leading to a long timeout in Task. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232315 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 06:12:14 +00:00
Vinod Kumar Vavilapalli 28c7235172 MAPREDUCE-3512. Batching JobHistory flushing to DFS so that we don't flush for every event slowing down AM. Contributed by Siddarth Seth. 
svn merge --ignore-ancestry -c 1230353 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230354 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-12 01:43:33 +00:00
Mahadev Konar 4c4a0f4f6c MAPREDUCE-3651. TestQueueManagerRefresh fails. (Thomas Graves via mahadev) - Merging r1230292 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230295 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 22:35:17 +00:00
Mahadev Konar 5b330e9119 MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev) - Merging r1229855 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229856 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 01:56:34 +00:00
Vinod Kumar Vavilapalli 92975b63e5 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR AM. Improved the earlier patch to not to JobHistoryServer repeatedly. Contributed by Anupam Seth. 
svn merge --ignore-ancestry -c 1229787 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229789 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 23:09:30 +00:00
Vinod Kumar Vavilapalli 6821efa3ae MAPREDUCE-3382. Enhanced MR AM to use a proxy to ping the job-end notification URL. Contributed by Ravi Prakash. 
svn merge --ignore-ancestry -c 1229736 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229737 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 21:09:41 +00:00
Vinod Kumar Vavilapalli 048ac6a4a3 MAPREDUCE-3639. Fixed TokenCache to work with absent FileSystem canonical service-names. (Siddharth Seth via vinodkv) 
svn merge --ignore-ancestry -c 1229444 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229446 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 01:39:47 +00:00
Vinod Kumar Vavilapalli 70fb248629 MAPREDUCE-3528. Fixed TaskHeartBeatHandler to use a new configuration for the thread loop interval separate from task-timeout configuration property. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1229403 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229405 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 22:38:10 +00:00
Vinod Kumar Vavilapalli 65e6abb477 MAPREDUCE-3511. Removed a multitude of cloned/duplicate counters in the AM thereby reducing the AM heap size and preventing full GCs. (vinodkv) 
svn merge -c 1229347 trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229350 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 21:07:25 +00:00
Alejandro Abdelnur e3e457398e Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 20:06:52 +00:00
Alejandro Abdelnur a7f8694d59 Merge -r 1227237:1227238 from trunk to branch. FIXES: MAPREDUCE-1744 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227789 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 19:50:43 +00:00
Siddharth Seth b988ba01cd merge MAPREDUCE-3615 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227742 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 18:48:46 +00:00
Siddharth Seth d296bc2a88 merge MAPREDUCE-3595 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227381 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 23:16:34 +00:00
Siddharth Seth eb82638bd7 merge MAPREDUCE-3529 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227375 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 23:08:38 +00:00
Siddharth Seth 769178f3c0 MAPREDUCE-3349. Log rack-name in JobHistory for unsuccessful tasks. (Contributed by Amar Kamat and Devaraj K) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221939 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 23:36:14 +00:00
Vinod Kumar Vavilapalli cc6328635b MAPREDUCE-3339. Fixed MR AM to stop considering node blacklisting after the number of nodes blacklisted crosses a threshold. Contributed by Siddharth Seth. 
svn merge -c 1221523 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221524 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 23:27:57 +00:00
Arun Murthy f57c920202 Merge -c 1221501 from trunk to branch-0.23 to fix MAPREDUCE-3376. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221502 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 22:02:04 +00:00
Arun Murthy 907e861241 Merge -c 1220996 from trunk to branch-0.23 to fix MAPREDUCE-3563. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220997 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 23:08:19 +00:00
Thomas White 8a58fd5440 Merge -r 1213970:1213971 from trunk to branch-0.23. Fixes: MAPREDUCE-3542. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215360 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:16:04 +00:00
Siddharth Seth 5f43332648 merge MAPREDUCE-3422 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215032 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 03:11:50 +00:00
Mahadev Konar 1430c33b6d MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via mahadev) - Merging r1214421 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214434 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 20:00:27 +00:00
Vinod Kumar Vavilapalli 88fe1ae2ed MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah. 
svn merge -c 1213987 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213989 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:42:50 +00:00
Vinod Kumar Vavilapalli affa6d2ee1 MAPREDUCE-2863. Support web services for YARN and MR components. Contributed by Thomas Graves. 
svn merge -c 1213975 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213978 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:12:33 +00:00
Mahadev Konar 04cb16ced7 MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev) - Merging r1213504 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213505 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 23:58:22 +00:00
Mahadev Konar 62edad08e8 MAPREDUCE-3518. mapred queue -info <queue> -showJobs throws NPE. (Jonathan Eagles via mahadev) - Merging r1213464 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213493 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 23:11:38 +00:00
Thomas White 81ac5efcaf Merge -r 1213349:1213350 from trunk to branch-0.23. Fixes: MAPREDUCE-3527 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213355 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 18:36:28 +00:00
Arun Murthy 194f52bbad Merge -c 1210738 from trunk to branch-0.23 to fix MAPREDUCE-3496. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210739 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-06 01:37:25 +00:00
Alejandro Abdelnur 89d89cb731 Merge -r 1209812:1209813 from trunk to branch. FIXES: HADOOP-3500 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209815 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 01:09:13 +00:00
Thomas White c4e06b5aac Merge -r 1209790:1209791 from trunk to branch-0.23. Fixes: MAPREDUCE-3479. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209792 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-03 00:18:17 +00:00
Siddharth Seth 463e78db70 merge MAPREDUCE-3443 from trunk. Contributed by Mahadev Konar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209232 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 20:43:34 +00:00
Mahadev Konar 2ba32989db MAPREDUCE-3450. NM port info no longer available in JobHistory. (Siddharth Seth via mahadev) - Merging r1208327 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208328 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 08:44:52 +00:00
Thomas White c4b13d74e5 Merge -r 1207754:1207755 from trunk to branch-0.23. Fixes: MAPREDUCE-3433 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207756 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 05:12:07 +00:00
Arun Murthy 7467e23b41 Merge -c 1205628 from trunk to branch-0.23 to fix MAPREDUCE-3265. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205629 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 22:06:47 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 23:47:40 +00:00
Vinod Kumar Vavilapalli 838bb254fe MAPREDUCE-3370. Fixed MiniMRYarnCluster and related tests to not use a hard-coded path for the mr-app jar. Contributed by Ahmed Radwan. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200776 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 08:53:47 +00:00
Vinod Kumar Vavilapalli 5ac8276168 MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George. 
svn merge -c r1200484 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200485 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 19:21:29 +00:00
Vinod Kumar Vavilapalli b7ff3d01b5 MAPREDUCE-3280. Removed the unnecessary job user-name configuration in mapred-site.xml. (vinodkv) 
svn merge -c r1200441 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200444 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 17:31:14 +00:00
Thomas White 4f5fdb21cc Merge -r 1198909:1198910 from trunk to branch-0.23. Fixes: MAPREDUCE-3344. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198914 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 20:16:12 +00:00