Commit Graph

1656 Commits

Author SHA1 Message Date
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
Mahadev Konar e0657fb161 MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) - Merging r1215065 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:17:00 +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
Vinod Kumar Vavilapalli edc58b0916 MAPREDUCE-3564. Fixed failures in TestStagingCleanup and TestJobEndNotifier tests. Contributed by Siddharth Seth.
svn merge -c 1215022 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215023 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 02:09:54 +00:00
Vinod Kumar Vavilapalli 660fb6cbf8 MAPREDUCE-3487. Fixed JobHistory web-UI to display links to single task's counters' page. Contributed by Jason Lowe.
svn merge -c 1215016 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215017 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 01:52:12 +00:00
Alejandro Abdelnur 1a231a0b22 Merge -r 1214789:1214790 from trunk to branch. FIXES: HADOOP-7917
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214792 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 14:47:22 +00:00
Mahadev Konar 89d38008a0 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev) - Merging r1214668 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:13:12 +00:00
Mahadev Konar e2c57d5e77 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster. (Anupam Seth via mahadev) - Merging r1214662 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214664 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:01:25 +00:00
Siddharth Seth e4f63a94b0 merge MAPREDUCE-3531 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214595 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:11:19 +00:00
Vinod Kumar Vavilapalli 87b8d8612c MAPREDUCE-3484. Fixed JobEndNotifier to not get interrupted before completing all its retries. Contributed by Ravi Prakash.
svn merge -c 1214563 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214566 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:59:54 +00:00
Vinod Kumar Vavilapalli 5aa03f2ef5 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
svn merge -c 1214476 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214478 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:23:41 +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 4ba1442b67 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
svn merge -c 1214429 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214432 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:58:00 +00:00
Alejandro Abdelnur 3ae9ee1005 Merge -r 1214353:1214354 from trunk to branch. FIXES: MAPREDUCE-3557
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214358 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 17:24:18 +00:00
Todd Lipcon 377c62a873 HDFS-2675. Reduce warning verbosity when double-closing edit logs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214096 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:13:01 +00:00
Amar Kamat b3dc6a9b92 MAPREDUCE-2950. [Rumen] Fixed TestUserResolve. (Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214084 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:57:34 +00:00
Eli Collins 71ce4a9c6a HDFS-2649. svn merge -c 1214046 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214049 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 03:57:21 +00:00
Tsz-wo Sze eb0ecec0c5 svn merge -c 1214027 from trunk for HDFS-2545.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214028 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:53:03 +00:00
Alejandro Abdelnur 9a6d5e328e Merge -r 1214016:1214017 from trunk to branch. FIXES: MAPREDUCE-3544
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214019 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:21:15 +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
Alejandro Abdelnur 771a5e7dce Merge -r 1213907:1213908 and 1213910:1213911 from trunk to branch. FIXES: HADOOP-7810
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213915 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:29:06 +00:00