Commit Graph

1685 Commits

Author SHA1 Message Date
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
Thomas White a45cc8a74c Merge -r 1228290:1228291 from trunk to branch-0.23. Fixes: HADOOP-7937
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1228292 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 17:26:42 +00:00
Alejandro Abdelnur 6455f96ec6 Merge -r 1227967:1227968 from trunk to branch. FIXES: HADOOP-7936
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227969 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 06:00:08 +00:00
Alejandro Abdelnur b22d5dc992 Merge -r 1227900:1227901 from trunk to branch. FIXES: HADOOP-7907
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227905 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 00:17:54 +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
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