Commit Graph

2384 Commits

Author SHA1 Message Date
Arun Murthy c6e7c24bde Merge -c 1241250 from trunk to branch-0.23 to fix MAPREDUCE-3354. Changed scripts so that jobhistory server is started by bin/mapred instead of bin/yarn. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241252 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 23:13:16 +00:00
Robert Joseph Evans 5a34d78282 svn merge -c 1241225 fixes MAPREDUCE-3804
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241230 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 22:41:31 +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
Arun Murthy 287501b2bc Merge -c 1241209 from trunk to branch-0.23 to fix MAPREDUCE-3813. Added a cache for resolved racks.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241210 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 22:07:51 +00:00
Arun Murthy caea6d2e85 Merge -c 1241205 from trunk to branch-0.23 to fix MAPREDUCE-3810. Performance tweaks - reduced logging in AM and defined hascode/equals for ResourceRequest & Priority.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241208 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 22:03:30 +00:00
Vinod Kumar Vavilapalli 6325888402 MAPREDUCE-3814. Fixed MRV1 compilation. (Arun C Murthy via vinodkv)
svn merge --ignore-ancestry -c 1241177 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241181 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 21:05:10 +00:00
Eli Collins db4d28d3bb HDFS-2893. svn merge -c 1240928 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240930 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:56:06 +00:00
Harsh J 556ad36563 Fix CHANGES.txt after 1240899 (HDFS-2868)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240902 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 07:25:50 +00:00
Harsh J 04c09247fb Fix CHANGES.txt after 1240899 (HDFS-2868)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240900 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 05:39:11 +00:00
Harsh J ce01f2ab1d HDFS-2868. svn merge -c 1240897 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 05:37:36 +00:00
Arun Murthy 3f78abc546 Merge -c 1240886 from trunk to branch-0.23 to fix MAPREDUCE-3746. Initialize queue metrics upfront and added start/finish time to RM Web-UI.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240887 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 03:39:50 +00:00
Mahadev Konar 4eb850ceb7 MAPREDUCE-3765. FifoScheduler does not respect yarn.scheduler.fifo.minimum-allocation-mb setting (Hitesh Shah via mahadev) - Merging r1240634 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240635 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 22:51:10 +00:00
Mahadev Konar aaa17aa6ab MAPREDUCE-3775. Change MiniYarnCluster to escape special chars in testname. (Hitesh Shah via mahadev) - Merging r1240603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240604 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 20:21:42 +00:00
Mahadev Konar 9bcf930433 MAPREDUCE-3759. ClassCastException thrown in -list-active-trackers when there are a few unhealthy nodes (vinodkv via mahadev) - Merging r1240598 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240599 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 20:04:44 +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
Mahadev Konar 845fb480c6 MAPREDUCE-3723. TestAMWebServicesJobs & TestHSWebServicesJobs incorrectly asserting tests (Bhallamudi Venkata Siva Kamesh via mahadev) - Merging r1240590 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240591 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 18:57:20 +00:00
Mahadev Konar 43d921b0ad MAPREDUCE-3791. can't build site in hadoop-yarn-server-common. (mahadev) - Merging r1240587 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240588 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 18:45:17 +00:00
Jitendra Nath Pandey d511d704d2 Merged r1240460 from trunk for HDFS-2785.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240461 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 07:02:30 +00:00
Tsz-wo Sze 2f0489edab Merge r1239398 through r1240449 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1240450 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 03:40:45 +00:00
Suresh Srinivas b6bcde5ce9 MAPREDUCE-3803. Merge change r1240441 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240444 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 02:40:54 +00:00
Vinod Kumar Vavilapalli 709bf8f903 MAPREDUCE-3417. Fixed job-access-controls to work with MR AM and JobHistoryServer web-apps. Contributed by Jonathan Eagles.
svn merge --ignore-ancestry -c 1240428 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240429 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 01:22:23 +00:00
Vinod Kumar Vavilapalli fff2f52a86 MAPREDUCE-3760. Changed active nodes list to not contain unhealthy nodes on the webUI and metrics. (vinodkv)
svn merge --ignore-ancestry -c 1240421 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240423 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 01:05:03 +00:00
Aaron Myers 38b4c3abae HDFS-2889. getNumCurrentReplicas is package private but should be public on 0.23 (see HDFS-2408). Contributed by Gregory Chanan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240415 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 00:09:53 +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
Robert Joseph Evans c03b3291fe svn merge -c 1240383 and svn merge -c 1240385 FIXES HADOOP-8013
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240386 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 23:03:39 +00:00
Robert Joseph Evans 220317c188 svn merge -c 1240232 fixes HADOOP-8018
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240236 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 16:33:18 +00:00
Tsz-wo Sze 1675dea883 svn merge -c 1240020 from trunk for HDFS-2879.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240021 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:29:43 +00:00
Vinod Kumar Vavilapalli fe7ab1d6c9 MAPREDUCE-3784. Fixed CapacityScheduler so that maxActiveApplications and maxActiveApplicationsPerUser per queue are not too low for small clusters. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1239971 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239972 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 01:18:15 +00:00
Mahadev Konar a85928e7b5 MAPREDUCE-3708. Metrics: Incorrect Apps Submitted Count (Bhallamudi via mahadev) - Merging r1239954 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239957 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 00:36:36 +00:00
Robert Joseph Evans 3d5c443a7d svn merge -c 1239924 fixes HADOOP-8015
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239925 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 23:28:55 +00:00
Todd Lipcon 3f38b5f7aa HDFS-2877. If locking of a storage dir fails, it will remove the other NN's lock file on exit. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239879 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 22:11:45 +00:00
Jitendra Nath Pandey 5796391773 Merged r1239763 from trunk for HDFS-2784.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239797 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:56:13 +00:00
Jitendra Nath Pandey 1884fe4648 Merged r1239464 from trunk for HDFS-2814.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239794 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:52:05 +00:00
Konstantin Shvachko 4c78384ecb HDFS-2718. Optimize OP_ADD in edits loading. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239769 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:12:42 +00:00
Eli Collins 12f83b380a HADOOP-8012. svn merge -c 1239752 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239753 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 18:45:47 +00:00
Robert Joseph Evans 7c0614e301 svn merge -c 1239727 FIXES HADOOP-8001
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239730 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 17:19:26 +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
Arun Murthy 4a0fcee1d0 Merge -c 1239443 from trunk to branch-0.23 to fix MAPREDUCE-3780. Fixed a bug where applications killed before getting activated were not getting cleaned up properly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239446 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 02:32:37 +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
Vinod Kumar Vavilapalli eb9a64e7c6 MAPREDUCE-3752. Modified application limits to include queue max-capacities besides the usual user limits. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1239422 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239423 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 00:42:18 +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
Tsz-wo Sze fe9369fb3c Merge r1237584 through r1239397 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1239398 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:24:15 +00:00
Arun Murthy 3d61db4cc4 Merge -c 1239391 from trunk to branch-0.23 to fix MAPREDUCE-3427. Fix streaming unit tests broken after mavenization.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239392 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:05:54 +00:00
Tsz-wo Sze fc5f04263d svn merge -c 1239386 from trunk for HADOOP-7470.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239389 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:02:11 +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
Vinod Kumar Vavilapalli 55086e5778 MAPREDUCE-3774. Moved yarn-default.xml to hadoop-yarn-common from hadoop-server-common.
svn merge --ignore-ancestry -c 1239291 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239292 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 19:56:26 +00:00
Alejandro Abdelnur be7b6b0073 Merge -r 1239221:1239222 from trunk to branch. FIXES: HADOOP-8009
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239231 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 17:46:30 +00:00
Alejandro Abdelnur 71750c9684 Setting the svn:ignore flag to target dirs of modules which didn't have it. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239217 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 17:26:00 +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