Commit Graph

773 Commits

Author SHA1 Message Date
Thomas Graves a291d9b72a merge -r 1294206:1294207 from trunk to branch-0.23. FIXES: MAPREDUCE-3913
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294209 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 16:46:24 +00:00
Tsz-wo Sze a05b3bda79 svn merge --reintegrate branch-0.23-PB back to 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294028 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 04:54:33 +00:00
Tsz-wo Sze def75f7560 Merge r1293501 through r1293896 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 17:58:14 +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 d4161fac0a MAPREDUCE-3910. Fixed a bug in CapacityScheduler LeafQueue which was causing app-submission to fail. Contributed by John George.
svn merge --ignore-ancestry -c 1293750 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293753 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 06:53:44 +00:00
Vinod Kumar Vavilapalli 1c7fb4f019 MAPREDUCE-2793. Reneabling commented out test from previous commit.
svn merge --ignore-ancestry -c 1293521 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293522 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:31:59 +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
Arun Murthy ef628953a0 Preparing for 0.23.3 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293508 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:43:05 +00:00
Tsz-wo Sze 0654e46791 Merge r1293034 through r1293500 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293501 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:09:01 +00:00
Robert Joseph Evans c5ee12af15 svn merge -c 1293469 trunk ot branch-0.23 FIXES MAPREDUCE-3918 proc_historyserver no longer in command line arguments for HistoryServer (Jon Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293470 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 23:01:32 +00:00
Thomas Graves 785573713c merege -r 1293455:1293456 from trunk. FIXES: MAPREDUCE-3904
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293459 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 22:33:31 +00:00
Vinod Kumar Vavilapalli 46801fdc94 MAPREDUCE-3730. Modified RM to allow restarted NMs to be able to join the cluster without waiting for expiry. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1293436 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293439 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:42:47 +00:00
Vinod Kumar Vavilapalli 39c86a9e65 MAPREDUCE-3866. Fixed the bin/yarn script to not print the command line unnecessarily. (vinodkv)
svn merge --ignore-ancestry -c 1293425 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293429 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:29:19 +00:00
Siddharth Seth 367dd52c16 merge MAPREDUCE-3738 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293061 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 02:13:25 +00:00
Tsz-wo Sze 9cb779d735 Revert TestAuditLogger changes from MAPREDUCE-3368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293058 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 02:09:09 +00:00
Tsz-wo Sze 024c23c95f Merge r1291972 through r1293033 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293035 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 23:52:26 +00:00
Tsz-wo Sze 8906c14c7c svn merge -c 1166842 from trunk for MAPREDUCE-2942.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293033 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 23:49:36 +00:00
Thomas Graves 1714f8b6c7 merge -r 1292830:1292831 from trunk to branch-0.23. FIXES: MAPREDUCE-3878
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292834 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 15:57:47 +00:00
Alejandro Abdelnur b512e9f282 Merge -r 1292423:1292424 from trunk to branch. FIXES: MAPREDUCE-3884
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292427 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 18:03:27 +00:00
Tsz-wo Sze 0e57409872 Merge r1245750 through r1291971 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1291974 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 19:56:04 +00:00
Vinod Kumar Vavilapalli 55a3a13afa MAPREDUCE-3798. Fixed failing TestJobCleanup.testCusomCleanup() and moved it to the maven build. Contributed by Ravi Prakash.
svn merge --ignore-ancestry -c 1291606 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291607 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 05:31:33 +00:00
Vinod Kumar Vavilapalli 518fed3ac0 MAPREDUCE-3634. Fixed all daemons to crash instead of hanging around when their EventHandlers get exceptions. (vinodkv)
svn merge --ignore-ancestry -c 1291598 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291600 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 05:11:29 +00:00
Steve Loughran 8f782a487f revert accidental indentation
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245915 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 13:06:40 +00:00
Steve Loughran b77e8aff45 MAPREDUCE-3877 Add a test to formalise the current state transitions of the yarn lifecycle
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245914 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 13:04:12 +00:00
Steve Loughran 017f6de1f7 MAPREDUCE-3877 Add a test to formalise the current state transitions of the yarn lifecycle
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245913 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 13:03:11 +00:00
Arun Murthy ab72c3fbe8 Merge -c 1245867 from trunk to branch-0.23 to fix MAPREDUCE-3880. Changed LCE binary to be 32-bit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245868 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 06:37:19 +00:00
Arun Murthy d3af9734bb MAPREDUCE-3856. Committing to 0.23.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245842 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 02:21:48 +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 0286c5fe05 svn merge -c 1245781 from trunk to branch 0.23 FIXES MAPREDUCE-3862. Nodemanager can appear to hang on shutdown due to lingering DeletionService threads (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245794 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 23:01:05 +00:00
Tsz-wo Sze bd3c2b26ec Merge r1244222 through r1245749 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 20:43:55 +00:00
Siddharth Seth e2beaf7976 merge MAPREDUCE-3856 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245277 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 01:03:00 +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
Todd Lipcon 11d6590a9a MAPREDUCE-3864. Fix cluster setup docs for correct SecondaryNameNode HTTPS parameters. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244853 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 05:53:34 +00:00
Alejandro Abdelnur 9ea26a7b08 Merge -r 1244263:1244264 from trunk to branch. FIXES: MAPREDUCE-3736
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244265 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:10:40 +00:00
Mahadev Konar c8debd083b MAPREDUCE-3858. Task attempt failure during commit results in task never completing. (Tom White via mahadev) - Merging r1244254 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244255 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:53:29 +00:00
Tsz-wo Sze fd0b6a9596 Merge r1242606 through r1244221 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1244226 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:49:02 +00:00
Vinod Kumar Vavilapalli d606016217 MAPREDUCE-3854. Fixed and reenabled tests related to MR child JVM's environmental variables in TestMiniMRChildTask. (Tom White via vinodkv)
svn merge --ignore-ancestry -c 1244223 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244224 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:45:09 +00:00
Vinod Kumar Vavilapalli 26d098b855 MAPREDUCE-3802. Added test to validate that AM can crash multiple times and still can recover successfully after MAPREDUCE-3846. (vinodkv)
svn merge --ignore-ancestry -c 1244178 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244180 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 19:25:30 +00:00
Vinod Kumar Vavilapalli 6eadd0201d MAPREDUCE-3846. Addressed MR AM hanging issues during AM restart and then the recovery. (vinodkv)
svn merge --ignore-ancestry -c 1243752 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243755 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 00:11:54 +00:00
Konstantin Shvachko 10c7f0eb15 MAPREDUCE-3837. Job tracker is not able to recover jobs after crash. Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243698 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 21:16:22 +00:00
Mahadev Konar 9a40365296 MAPREDUCE-3852. Test TestLinuxResourceCalculatorPlugin failing. (Thomas Graves via mahadev) - Merging r1243418 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243420 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 05:42:36 +00:00
Thomas Graves 27972f06df merge -r 1242975:1242976 from trunk. FIXES: MAPREDUCE-3843
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242977 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 23:26:37 +00:00
Vinod Kumar Vavilapalli f8e89773af Cleaning up hadoop-mapreduce-project/CHANGES.txt a bit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242898 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 19:47:59 +00:00
Thomas Graves eb5cc10881 merge -r 1242789:1242790 from trunk. FIXES: MAPREDUCE-3680
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242792 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 14:37:20 +00:00
Tsz-wo Sze 6c0178e7e5 Merge r1241554 through r1242605 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1242642 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 03:04:05 +00:00
Tsz-wo Sze b26cb2ba6f svn merge -c 1242485 from trunk for HADOOP-7923.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242490 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 19:53:22 +00:00
Robert Joseph Evans e9c32d2ad1 svn merge -c 1241999 fixes MAPREDUCE-3840 JobEndNotifier doesn't use the proxyToUse during connecting
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242002 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 17:36:57 +00:00
Amar Kamat df16466878 MAPREDUCE-3770. Zombie.getJobConf() results into NPE. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241865 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 11:08:21 +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
Arun Murthy 454ccfd82e Preparing for release 0.23.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241797 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 07:37:07 +00:00
Arun Murthy b180a2e7ac Merge -c 1241791 from trunk to branch-0.23 to fix MAPREDUCE-3828. Ensure that urls in single-node mode are correct. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241793 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 07:14:03 +00:00
Arun Murthy 38f5dd8bf5 MAPREDUCE-3415. Moving to 0.23.1 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241756 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 03:04:39 +00:00
Vinod Kumar Vavilapalli 595ea04385 MAPREDUCE-3834. Changed MR AM to not add the same rack entry multiple times into the container request table when multiple hosts for a split happen to be on the same rack. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1241734 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241735 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 01:57:02 +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 5443f258fb merge <JIRA> from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241693 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 23:07:56 +00:00
Arun Murthy 1d7d598a9f Fixed jira id in commit for MAPREDUCE-3826.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241690 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 23:05:09 +00:00
Arun Murthy 61393abe47 Merge -c 1241685 from trunk to branch-0.23 to fix MAPREDUCE-3823. Fixed a bug in RM web-ui which broke sorting.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241686 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 23:00:49 +00:00
Arun Murthy e4d7448b7f Merge -c 1241659 from trunk to branch-0.23 to fix MAPREDUCE-3833. Fixed a bug in reinitiaziling of queues. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241660 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 22:10:01 +00:00
Vinod Kumar Vavilapalli 9567b8db20 MAPREDUCE-3815. Fixed MR AM to always use hostnames and never IPs when requesting containers so that scheduler can give off data local containers correctly. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1241654 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241655 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 21:59:39 +00:00
Tsz-wo Sze 50335922f7 svn merge -c 1241253 from trunk for MAPREDUCE-3818.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241625 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 21:04:23 +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
Tsz-wo Sze 88bf529cfd Merge r1240450 through r1241553 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241555 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:12:19 +00:00
Mahadev Konar 46514fd253 MAPREDUCE-3709. TestDistributedShell is failing. (Hitesh Shah via mahadev) - Merging r1241325 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241327 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 02:00:55 +00:00
Arun Murthy 984c80dffc Merge -c 1241323 from trunk to branch-0.23 to fix MAPREDUCE-3817. Fixed bin/mapred to allow running of distcp and archive jobs. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241324 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 01:50:23 +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
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
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
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
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
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
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
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 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
Arun Murthy 999708d065 Merge -c 1238987 from trunk to branch-0.23 to fix MAPREDUCE-3762. Fixed default CapacityScheduler configs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238989 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:58:53 +00:00
Vinod Kumar Vavilapalli 247695b338 MAPREDUCE-3754. Modified RM UI to filter applications based on state of the applications. (vinodkv)
svn merge --ignore-ancestry -c 1238887 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238888 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 00:52:51 +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 2f701e07d3 Merge -c 1238255 from trunk to branch-0.23 to fix MAPREDUCE-3764. Fixed resource usage metrics for queues and users.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238256 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 08:31:16 +00:00
Arun Murthy fc4ed3ca7b Merge -c 1238157 from trunk to branch-0.23 to fix MAPREDUCE-3748. Changed a log in CapacityScheduler.nodeUpdate to debug.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238159 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 06:23:32 +00:00
Mahadev Konar 2c3a00c3eb MAPREDUCE-3679. AM logs and others should not automatically refresh after every 1 second. (Vinod KV via mahadev) - Merging r1238146 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238148 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 04:58:16 +00:00
Vinod Kumar Vavilapalli 3861f9f50d MAPREDUCE-3716. Fixing YARN+MR to allow MR jobs to be able to use java.io.File.createTempFile to create temporary files as part of their tasks. Contributed by Jonathan Eagles.
svn merge --ignore-ancestry -c 1238136 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238138 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 02:24:54 +00:00
Mahadev Konar fc432d7f33 MAPREDUCE-3703. ResourceManager should provide node lists in JMX output. (Eric Payne via mahadev) - Merge r1237920 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1237921 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 18:51:03 +00:00
Tsz-wo Sze ab824d9e9b Merge r1236386 through r1237583 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1237590 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 10:17:28 +00:00
Amar Kamat 4b946ebdf2 MAPREDUCE-2784. [Gridmix] Bug fixes in ExecutionSummarizer and ResourceUsageMatcher. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1237579 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 09:41:20 +00:00
Amar Kamat 2ef107ff90 MAPREDUCE-3481. [Gridmix] Improve Gridmix STRESS mode. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1237578 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 09:38:47 +00:00
Tsz-wo Sze b92bd6aed4 svn merge -c 1236901 from trunk for MAPREDUCE-3740.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1237550 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 07:15:33 +00:00
Vinod Kumar Vavilapalli 94790f2a1c MAPREDUCE-3732. Modified CapacityScheduler to use only users with pending requests for computing user-limits. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1236953 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236954 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 01:35:45 +00:00
Alejandro Abdelnur 4132e3991e Merge -r 1236928:1236929 from trunk to branch. FIXES: HADOOP-7939
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236934 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:10:34 +00:00
Mahadev Konar 36bfc71cdf MAPREDUCE-3742. "yarn logs" command fails with ClassNotFoundException. (Jason Lowe via mahadev) - Merging r1236816 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236818 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 18:54:24 +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 890abf867c MAPREDUCE-3360. Added information about lost/rebooted/decommissioned nodes on the webapps. Contributed by Bhallamudi Venkata Siva Kamesh and Jason Lowe.
svn merge --ignore-ancestry -c 1236433 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236438 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 22:58:12 +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
Tsz-wo Sze 359c746ca7 Merge r1234388 through r1236385 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1236395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 21:37:26 +00:00
Mahadev Konar ccaba4ba7e MAPREDUCE-3737. The Web Application Proxy's is not documented very well. (Robert Evans via mahadev) - Merging r1236371 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236373 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 20:12:24 +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
Mahadev Konar 5dd4c5a6f7 MAPREDUCE-3735. Add distcp jar to the distribution (tar). (mahadev) - Merging r1236336 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236337 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:14:01 +00:00
Mahadev Konar c9a5c42efd MAPREDUCE-3733. Add Apache License Header to hadoop-distcp/pom.xml. (mahadev) - Merging r1236066 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236068 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 08:31:54 +00:00
Mahadev Konar 505dd18690 MAPREDUCE-2765. DistCp Rewrite. (Mithun Radhakrishnan via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236049 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 06:50:00 +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 6d5b37e261 MAPREDUCE-3713. Fixed the way head-room is allocated to applications by CapacityScheduler so that it deducts current-usage per user and not per-application. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1235989 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235990 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 23:32:11 +00:00
Robert Joseph Evans 142b34f065 merge MAPREDUCE-3194
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235959 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 21:28:49 +00:00
Arun Murthy 8507d72465 Merge -c 1235858 from trunk to branch-0.23 to fix MAPREDUCE-3683. Fixed maxCapacity of queues to be product of parent maxCapacities.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235860 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 18:19:02 +00:00
Siddharth Seth ac9e1a8103 merge MAPREDUCE-3630 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235642 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 06:31:08 +00:00
Mahadev Konar c929ba95a9 MAPREDUCE-3717. JobClient test jar has missing files to run all the test programs. (mahadev) - Merging r1235639 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235640 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 06:26:22 +00:00
Mahadev Konar 75f8caf8d3 MAPREDUCE-3712. The mapreduce tar does not contain the hadoop-mapreduce-client-jobclient-tests.jar. (mahadev) - Merging r1235566 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235567 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 00:16:42 +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
Alejandro Abdelnur 1a1474885b Merge -r 1235390:1235391 from trunk to branch. FIXES: MAPREDUCE-3505
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235397 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 18:26:17 +00:00
Eli Collins 517766b98b HDFS-2397. svn merge -c 1235135 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235136 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 06:10:21 +00:00
Arun Murthy 439446057d Merge -c 1235103 from trunk to branch-0.23 to fix MAPREDUCE-3681. Fixed computation of queue's usedCapacity.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235104 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 01:06:55 +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
Mahadev Konar d0b1cd9b7e MAPREDUCE-3702 and MAPREDUCE-3691 - merging r1234991 and r1234989 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234994 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:27:19 +00:00
Tsz-wo Sze 6e8fe7af37 Merge r1233741 through r1234387 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1234406 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 19:50:30 +00:00
Mahadev Konar fbe394d208 MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234228 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 01:17:43 +00:00
Mahadev Konar 6b3f5b7bd2 MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) - Merging r1234222 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:55:16 +00:00
Mahadev Konar 6d331aee03 MAPREDUCE-3701. Delete HadoopYarnRPC from 0.23 branch. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234161 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 21:47:59 +00:00
Mahadev Konar f80dc919ad MAPREDUCE-3689. RM web UI doesn't handle newline in job name. (Thomas Graves via mahadev) - Merging r1234148 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234149 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 21:29:28 +00:00
Mahadev Konar 6f27abfe72 MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev) - Merging r1234120 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234125 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 20:47:02 +00:00
Alejandro Abdelnur 25e8aad054 Merge -r 1233089:1233090 from trunk to branch. FIXES: MAPREDUCE-3582
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234100 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:54:20 +00:00
Alejandro Abdelnur 5ddfc8b6b5 Merge -r 1222694:1222695 from trunk to branch. FIXES: MAPREDUCE-3597
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234086 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:30:11 +00:00
Alejandro Abdelnur 71ac65859e Merge -r 1215140:1215141 from trunk to branch. FIXES: MAPREDUCE-778
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234070 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 18:55:20 +00:00
Tsz-wo Sze f2a3dccbd8 Merge r1232271 through r1233740 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1233742 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 03:14:44 +00:00
Eli Collins a1e2e74dcb MAPREDUCE-3692. svn merge -c 1233605 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1233622 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 22:49:40 +00:00
Thomas White 76ef392a2e Merge -r 1232980:1232981 from trunk to branch-0.23. Fixes: MAPREDUCE-3684
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232982 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 18:21:45 +00:00
Arun Murthy 5f2f884a34 Merge -c 1232580 from trunk to branch-0.23 to fix MAPREDUCE-3669. Allow clients to talk to MR HistoryServer using both delegation tokens and kerberos.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232581 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:27:42 +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
Tsz-wo Sze 03d05902e4 Merge r1231828 through r1232270 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1232275 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 02:28:49 +00:00
Vinod Kumar Vavilapalli 926fd5463a MAPREDUCE-3641. Making CapacityScheduler more conservative so as to assign only one off-switch container in a single scheduling iteration. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1232182 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232183 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:57:13 +00:00
Mahadev Konar d49f305f0b MAPREDUCE-3657. State machine visualize build fails. (Jason LoweMAPREDUCE-3657. State machine visualize build fails. (Jason Lowe via mahadev) - Merging r1232167 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232168 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:23:41 +00:00
Mahadev Konar 21fa0778c5 MAPREDUCE-3649. Job End notification gives an error on calling back. (Ravi Prakash via mahadev) - Merging r1232126 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232128 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 19:40:00 +00:00
Jitendra Nath Pandey 72a5977cf7 Merged r1230708 from trunk for MAPREDUCE-3664.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232124 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 19:27:57 +00:00
Tsz-wo Sze e4e47a7519 Merge r1227776 through r1231827 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1231834 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 04:24:24 +00:00
Vinod Kumar Vavilapalli 9febd5869c MAPREDUCE-3404. Corrected MR AM to honor speculative configuration and enable speculating either maps or reduces. Contributed by Eric Payne.
svn merge --ignore-ancestry -c 1231395 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231397 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 23:42:09 +00:00
Vinod Kumar Vavilapalli 25f7d5999a MAPREDUCE-3532. Modified NM to report correct http address when an ephemeral web port is configured. Contributed by Bhallamudi Venkata Siva Kamesh.
svn merge --ignore-ancestry -c 1231342 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231344 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 22:22:33 +00:00
Vinod Kumar Vavilapalli 77c29ccb53 MAPREDUCE-3656. Fixed a race condition in MR AM which is failing the sort benchmark consistently. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1231314 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231316 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 21:32:58 +00:00
Siddharth Seth a8ba510900 merge MAPREDUCE-3596 from trunk. Fix scheduler to handle cleaned up containers, which NMs may subsequently report as running. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231303 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 21:17:59 +00:00
Tsz-wo Sze 228ee31512 svn merge -c 1214106 from trunk for MAPREDUCE-3545 to delete the empty files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230884 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:38:30 +00:00
Tsz-wo Sze 66f4e8b694 svn merge -c 1214066 from trunk for MAPREDUCE-3545.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:26:08 +00:00
Tsz-wo Sze 4b5d4bb1fc svn merge -c 1210208 from trunk for the mapreduce part of HADOOP-7862.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230878 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:20:46 +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 eab72ff455 MAPREDUCE-3625. CapacityScheduler web-ui display of queue's used capacity is broken. (Jason Lowe via mahadev) - Merging r1230336 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230338 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 00:17:06 +00:00
Mahadev Konar 350ed9a0e1 MAPREDUCE-3553. Add support for data returned when exceptions thrown from web service apis to be in either xml or in JSON. (Thomas Graves via mahadev) - Merging r1230330 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230333 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 00:02:02 +00:00
Mahadev Konar 01fe04be36 MAPREDUCE-3652. org.apache.hadoop.mapred.TestWebUIAuthorization.testWebUIAuthorization fails. (Thomas Graves via mahadev) - Merging r1230328 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230329 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 23:53:15 +00:00
Mahadev Konar 15c7957088 MAPREDUCE-3645. TestJobHistory fails. (Thomas Graves via mahadev) - Merging r1230307 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230308 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 22:54:44 +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 3c25797b34 MAPREDUCE-3648. TestJobConf failing. (Thomas Graves via mahadev) - Merging r1230202 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230203 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 19:39:18 +00:00
Vinod Kumar Vavilapalli 8327271efc MAPREDUCE-3618. Fixed TaskHeartbeatHandler to not hold a global lock for all task-updates. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1229906 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229908 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 06:55:18 +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 dd807a1e8a MAPREDUCE-3299. Added AMInfo table to the MR AM job pages to list all the job-attempts when AM restarts and recovers. (Jonathan Eagles via vinodkv)
svn merge --ignore-ancestry -c 1229766 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229768 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 22:28:22 +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 4175e70020 MAPREDUCE-3312. Modified MR AM to not send a stop-container request for a container that isn't launched at all. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1229451 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229452 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 02:16:53 +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
Siddharth Seth 16288c5a7c merge MAPREDUCE-3616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 22:21:42 +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
Tsz-wo Sze 6a2e101e8c svn merge -c 1167318 from trunk for MAPREDUCE-2934.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228673 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:21:01 +00:00
Tsz-wo Sze 4384dca37a svn merge -c 1164771 from trunk for MAPREDUCE-2887.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228671 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 17:16:26 +00:00
Arun Murthy 776be1de32 Merge -c 1228354 from trunk to branch-0.23 to fix MAPREDUCE-3624. Remove unnecessary dependency on JDK's tools.jar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1228355 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 19:13:02 +00:00
Arun Murthy 93dce45243 Merge -c 1227808 from trunk to branch-0.23 to fix MAPREDUCE-3617.emoved wrong default value for yarn.resourcemanager.principal and yarn.nodemanager.principal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227810 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:12:09 +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
Arun Murthy 2281b945d8 Merge -c 1227801 from trunk to branch-0.23 to fix MAPREDUCE-3548. MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227802 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:02:15 +00:00
Arun Murthy 1828be291a Merge -c 1227788 from trunk to branch-0.23 to fix MAPREDUCE-3326. Added detailed information about queue's to the CapacityScheduler web-ui.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227794 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:52:19 +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 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
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