Commit Graph

282 Commits

Author SHA1 Message Date
Aaron Myers 6177bf6c8f Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233105 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 23:02:17 +00:00
Aaron Myers 940eeb866c Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232184 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:57:28 +00:00
Vinod Kumar Vavilapalli 4a343c9d4a 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232182 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:56:14 +00:00
Mahadev Konar c81995e370 MAPREDUCE-3657. State machine visualize build fails. (Jason Lowe via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232167 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:22:21 +00:00
Vinod Kumar Vavilapalli 90f096d86c MAPREDUCE-3532. Modified NM to report correct http address when an ephemeral web port is configured. Contributed by Bhallamudi Venkata Siva Kamesh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231342 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 22:21:33 +00:00
Siddharth Seth 78ff0b720e MAPREDUCE-3596. 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/trunk@1231297 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 21:15:22 +00:00
Aaron Myers 58f2da1c85 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1231242 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 18:54:02 +00:00
Jitendra Nath Pandey f717c5785e MAPREDUCE-3664. Federation Documentation has incorrect configuration example. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230708 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 19:11:33 +00:00
Aaron Myers 8610a9231a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230696 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 18:40:50 +00:00
Mahadev Konar 0086014703 MAPREDUCE-3625. CapacityScheduler web-ui display of queue's used capacity is broken. (Jason Lowe via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230336 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 00:15:35 +00:00
Mahadev Konar 5f79f180f6 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)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230330 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 23:59:23 +00:00
Aaron Myers ede7f21278 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230248 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 20:53:50 +00:00
Mahadev Konar bc4b1f48d3 MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229855 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 01:50:10 +00:00
Vinod Kumar Vavilapalli 7712e70090 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229787 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 23:07:54 +00:00
Aaron Myers ade897636d Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229279 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 18:01:55 +00:00
Arun Murthy 5ba6477099 MAPREDUCE-3624. Remove unnecessary dependency on JDK's tools.jar. Contributed by Mahadev Konar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228354 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 19:12:02 +00:00
Aaron Myers d680080da0 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228339 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 18:47:05 +00:00
Arun Murthy 2919ce8c8b MAPREDUCE-3617. Removed wrong default value for yarn.resourcemanager.principal and yarn.nodemanager.principal. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227808 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:11:09 +00:00
Arun Murthy 7440a8aa37 MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227801 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:01:20 +00:00
Arun Murthy 4404f20671 MAPREDUCE-3326. Added detailed information about queue's to the CapacityScheduler web-ui. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227788 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:50:18 +00:00
Alejandro Abdelnur 6d45b9e31d HADOOP-7934. Normalize dependencies versions across all modules. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227787 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:46:42 +00:00
Aaron Myers 3187a3ae05 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227775 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:21:01 +00:00
Mahadev Konar e793ba8cba MAPREDUCE-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227408 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 00:13:39 +00:00
Aaron Myers 4d768140b3 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225900 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 19:25:18 +00:00
Arun Murthy 4ab6ae543e MAPREDUCE-3608. Fixed compile issue with MAPREDUCE-3522. Contributed by Mahadev Konar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225726 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 02:24:14 +00:00
Arun Murthy 743a5b78e3 MAPREDUCE-3522. Ensure queues inherit ACLs from parent if they aren't explicitly specified. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225618 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 19:06:34 +00:00
Aaron Myers f216303598 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 18:25:48 +00:00
Arun Murthy f025652fda MAPREDUCE-3547. Added a bunch of unit tests for the the RM/NM webservices. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225463 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:06:04 +00:00
Aaron Myers d619dee4ed Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225264 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:37:22 +00:00
Vinod Kumar Vavilapalli cd90b82227 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224970 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:26:21 +00:00
Aaron Myers a500ba50c2 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1224965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:18:36 +00:00
Siddharth Seth 8fa0a3c737 MAPREDUCE-3567. Extraneous JobConf objects in AM heap. Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1222498 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 22:34:40 +00:00
Vinod Kumar Vavilapalli ef9b974879 MAPREDUCE-3586. Modified CompositeService to avoid duplicate stop operations thereby solving race conditions in MR AM shutdown. (vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221950 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 23:47:54 +00:00
Vinod Kumar Vavilapalli 8626f1bc6c MAPREDUCE-3588. Fixed bin/yarn which was broken by MAPREDUCE-3366 so that yarn daemons can start. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221533 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 00:06:06 +00:00
Vinod Kumar Vavilapalli e7543b944c MAPREDUCE-3339. Fixed MR AM to stop considering node blacklisting after the number of nodes blacklisted crosses a threshold. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221523 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:27:02 +00:00
Vinod Kumar Vavilapalli 4e1d5a0d71 MAPREDUCE-3391. Making a trivial change to correct a log message in DistributedShell app's AM. Contributed by Subroto Sanyal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:13:15 +00:00
Todd Lipcon 8ff28f4549 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:34:51 +00:00
Harsh J 2cf4aca02e MAPREDUCE-3579. ConverterUtils shouldn't include a port in a path from a url without a port (Contributed by atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215528 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:10:12 +00:00
Aaron Myers 08c9dc3780 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:31:46 +00:00
Vinod Kumar Vavilapalli feb3a23c71 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215345 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:41:36 +00:00
Mahadev Konar 6d551b83de MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215065 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:09:28 +00:00
Aaron Myers d937abd434 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214944 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 20:05:38 +00:00
Mahadev Konar 227fb568b8 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214668 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:11:18 +00:00
Mahadev Konar beec374542 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster (Anupam Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214662 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 08:58:51 +00:00
Siddharth Seth 14ba2e65c9 MAPREDUCE-3531. Fixed a race in ContainerTokenSecretManager. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214593 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:09:16 +00:00
Todd Lipcon b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:34:04 +00:00
Vinod Kumar Vavilapalli c32ca00a75 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214476 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:22:32 +00:00
Vinod Kumar Vavilapalli 50fa9b89f4 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214429 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:55:22 +00:00
Suresh Srinivas f7f5e51431 Missed deleting the files in r1214066
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:30:37 +00:00
Suresh Srinivas ec4971a280 MAPREDUCE-3545. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 06:57:00 +00:00