Commit Graph

1677 Commits

Author SHA1 Message Date
Jitendra Nath Pandey 6bfb77a351 Creating branch off branch-0.23 to merge back protobuf changes in HDFS-2060
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1227776 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:21:06 +00:00
Suresh Srinivas 3af44a310d HDFS-2710. Add HDFS tests related to HADOOP-7933. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227759 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:59:26 +00:00
Suresh Srinivas c0b64eeeba HDFS-7808 merging change r1227737 from trunk to 0.23 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227744 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:51:47 +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 2d360c5514 merge MAPREDUCE-3569 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227486 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 05:20:40 +00:00
Eli Collins 46bc75cf30 HADOOP-7924. svn merge -c 1227423 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227431 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:49:21 +00:00
Arun Murthy fa86b57c30 Merge -c 1227426 from trunk to branch-0.23 to fix MAPREDUCE-3572. Moved AM event dispatcher to a separate thread for performance reasons.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227428 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:38:49 +00:00
Arun Murthy 2122954a0d Merge -c 1227422 from trunk to branch-0.23 to fix MAPREDUCE-3566. Fixed MR AM to construct CLC only once across all tasks.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227424 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:34:48 +00:00
Mahadev Konar e5df95f8cb MAPREDUCE-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev) - Merging r1227408 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227409 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 00:16:09 +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
Alejandro Abdelnur 19f69fa577 Merge -r 1227224:1227225 from trunk to branch. FIXES: HADOOP-7948
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227234 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 17:37:50 +00:00
Vinod Kumar Vavilapalli 16b1c5c24d MAPREDUCE-3490. Fixed MapReduce AM to count failed maps also towards Reduce ramp up. Contributed by Sharad Agarwal and Arun C Murthy.
svn merge -c 1227226 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227227 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 17:12:06 +00:00
Harsh J aa4147c428 merge MAPREDUCE-3610 (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227098 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 10:18:24 +00:00
Amar Kamat 9bebe5e0b7 MAPREDUCE-3462. Fix Gridmix JUnit testcase failures. (Ravi Prakash and Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227052 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 05:39:28 +00:00
Siddharth Seth 75fb338360 merge HADOOP-7933 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226917 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 19:00:28 +00:00
Harsh J 4f2b026450 merge HDFS-2722 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 17:20:20 +00:00
Harsh J e0c776dda9 merge HADOOP-7504 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226352 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 06:34:42 +00:00
Harsh J c0f4668bd4 merge HDFS-2574
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226212 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 03:16:21 +00:00
Arun Murthy 01b14ae65f Merge -c 1225726 from trunk to branch-0.23 to fix MAPREDUCE-3608.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225728 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 02:24:46 +00:00
Arun Murthy a178401dc9 Merge -c 1225618 from trunk to branch-0.23 to fix MAPREDUCE-3522.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225619 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 19:07:23 +00:00
Arun Murthy 0e4f690197 Merge -c 1225471 from trunk to branch-0.23 to fix MAPREDUCE-3521.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225472 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:24:41 +00:00
Arun Murthy c0e9c8bf5e Merge -c 1225463 from trunk to branch-0.23 to fix MAPREDUCE-3547.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225466 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:07:36 +00:00
Arun Murthy fc62f00ffc Merge -c 1225259 from trunk to branch-0.23 to fix MAPREDUCE-3604.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225261 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:25:13 +00:00
Vinod Kumar Vavilapalli a1b5b3541e MAPREDUCE-3568. Optimized Job's progress calculations in MR AM. (vinodkv)
svn merge -c 1224995 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224996 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 19:55:56 +00:00
Vinod Kumar Vavilapalli 37d68c060f MAPREDUCE-3399. Modifying ContainerLocalizer to send a heartbeat to NM immediately after downloading a resource instead of always waiting for a second. Contributed by Siddarth Seth.
svn merge -c 1224970 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224971 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:27:51 +00:00
Alejandro Abdelnur 4c3ea975d1 Merge -r 1224793:1224794 from trunk to branch. FIXES: HDFS-2707
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224795 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 19:41:14 +00:00
Siddharth Seth 67e975d653 Merge MAPREDUCE-3567 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1222499 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 22:36:08 +00:00
Vinod Kumar Vavilapalli 9cd2e3be26 MAPREDUCE-3586. Modified CompositeService to avoid duplicate stop operations thereby solving race conditions in MR AM shutdown. (vinodkv)
svn merge -c 1221950 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221951 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 23:49:39 +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
Mahadev Konar 8d714e9355 HADOOP-7890. Redirect hadoop script's deprecation message to stderr. (Koji Knoguchi via mahadev) - Merging r1221849 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221850 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 19:36:03 +00:00
Alejandro Abdelnur ca5aa2c36f Merge -r 1221615:1221616 from trunk to branch. FIXES: HDFS-2705
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221619 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 05:53:50 +00:00
Alejandro Abdelnur 451dfb1005 Merge -r 1221579:1221580 from trunk to branch. FIXES: HDFS-2657
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221584 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 03:06:10 +00:00
Alejandro Abdelnur dc82b91b5e Merge -r 1221571:1221572 from trunk to branch. FIXES: HDFS-2646
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 02:54:08 +00:00
Vinod Kumar Vavilapalli 57ec186751 MAPREDUCE-3588. Fixed bin/yarn which was broken by MAPREDUCE-3366 so that yarn daemons can start. Contributed by Arun C Murthy.
svn merge -c 1221533 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221534 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 00:06:56 +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
Vinod Kumar Vavilapalli 30dea757e1 MAPREDUCE-3391. Making a trivial change to correct a log message in DistributedShell app's AM. Contributed by Subroto Sanyal.
svn merge -c 1221516 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221517 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:14:05 +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
Eli Collins 7b8c41dd84 HADOOP-7837. svn merge -c 1221348 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221350 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 17:18:35 +00:00
Tsz-wo Sze 6c6d28387f svn merge -c 1221106 from trunk for HDFS-2706.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221107 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 05:51:25 +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
Alejandro Abdelnur f325906f2a Merge -r 1220809:1220810 from trunk to branch. FIXES: HDFS-2658
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220814 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 15:56:57 +00:00
Eli Collins 1c45c96dc0 HDFS-2335. svn merge -c 1220510 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220513 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 18:21:31 +00:00
Todd Lipcon c881725a86 HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220316 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 01:12:45 +00:00
Todd Lipcon 27524695ed Amend previous commit of HADOOP-7657 (LZ4 compression). Fix a mistaken #include
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220313 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 00:52:25 +00:00
Todd Lipcon 4b87a5ba90 HADOOP-7657. Add support for LZ4 compression. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220312 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 00:47:21 +00:00
Harsh J b12d8f3c7c merge MAPREDUCE-3579
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215534 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:36:45 +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
Thomas White 5fe01ec75a Merge -r 1215353:1215354 from trunk to branch-0.23. Fixes: HDFS-2640.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215355 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:12:05 +00:00
Vinod Kumar Vavilapalli 84138f3864 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
svn merge -c 1215345 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215347 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:42:56 +00:00