Commit Graph

236 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
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 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
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
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
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
Harsh J b12d8f3c7c merge MAPREDUCE-3579
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215534 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:36:45 +00:00
Vinod Kumar Vavilapalli 84138f3864 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
svn merge -c 1215345 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215347 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:42:56 +00:00
Mahadev Konar e0657fb161 MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) - Merging r1215065 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:17:00 +00:00
Mahadev Konar 89d38008a0 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev) - Merging r1214668 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:13:12 +00:00
Mahadev Konar e2c57d5e77 MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster. (Anupam Seth via mahadev) - Merging r1214662 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214664 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:01:25 +00:00
Siddharth Seth e4f63a94b0 merge MAPREDUCE-3531 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214595 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:11:19 +00:00
Vinod Kumar Vavilapalli 5aa03f2ef5 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
svn merge -c 1214476 --ignore-ancestry ../../trunk/


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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214432 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:58:00 +00:00
Vinod Kumar Vavilapalli affa6d2ee1 MAPREDUCE-2863. Support web services for YARN and MR components. Contributed by Thomas Graves.
svn merge -c 1213975 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213978 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:12:33 +00:00
Arun Murthy 88f815fc54 Merge -c 1213575 from trunk to branch-0.23 to fix MAPREDUCE-3537.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:35:10 +00:00
Mahadev Konar f340be0927 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev) - Merging r1213511 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:24:48 +00:00
Vinod Kumar Vavilapalli f005c3223c MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi.
svn merge -c 1212680 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212681 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 23:19:59 +00:00
Tsz-wo Sze 518998937b svn merge -c 1212299 from trunk for HDFS-2594.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212301 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:34:32 +00:00
Mahadev Konar 24dcbbc524 MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory. (chackaravarthy via mahadev) - Merging r1212215 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212216 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 02:01:22 +00:00
Mahadev Konar a1938ca733 MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value for queues (Anupam Seth via mahadev) - Merging r1212212 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212213 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:44:04 +00:00
Mahadev Konar 740e269b8f MAPREDUCE-3147. Handle leaf queues with the same name properly. (Ravi Prakash via mahadev) - Merging r1211243 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211247 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 00:39:22 +00:00
Mahadev Konar 63c0db36e2 MAPREDUCE-3485. DISKS_FAILED -101 error code should be defined in same location as ABORTED_CONTAINER_EXIT_STATUS. (Ravi Gummadi via mahadev) - Merging r1210192 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210194 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:12:41 +00:00
Mahadev Konar 7fd4dce613 MAPREDUCE-3456. $HADOOP_PREFIX/bin/yarn should set defaults for $HADOOP_*_HOME (Eric Payne via mahadev) - Merging r1209825 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209826 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 03:44:01 +00:00
Siddharth Seth e5822af421 merge -c 1209759 from trunk. MAPREDUCE-3453
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209764 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:53:17 +00:00
Siddharth Seth 1912f4c7b8 mrege MAPREDUCE-3460 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209740 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:22:01 +00:00
Mahadev Konar a7b206219c MAPREDUCE-3452. fifoscheduler web ui page always shows 0% used for the queue. (Jonathan Eagles via mahadev) - Merging r1208999 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209002 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:45:43 +00:00
Mahadev Konar 2ef6051da9 MAPREDUCE-3463. Second AM fails to recover properly when first AM is killed with java.lang.IllegalArgumentException causing lost job. (Siddharth Seth via mahadev) - Merging r1208994 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208995 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:37:14 +00:00
Alejandro Abdelnur 287c0ffa51 Merge -r 1208767:1208768 from trunk to branch. FIXES: MAPREDUCE-3477
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208770 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:51:51 +00:00
Mahadev Konar de8f0efe60 MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) - Merging r1208131 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:28:16 +00:00
Siddharth Seth 441f6a3b05 merge MAPREDUCE-3045 from trunk. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207717 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:14:54 +00:00
Mahadev Konar 7f97bed786 MAPREDUCE-3413. RM web ui applications not sorted in any order by default. (Jonathan Eagles via mahadev) - Merging r1206926 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206928 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:59:31 +00:00
Mahadev Konar 9521bc3d3e MAPREDUCE-3238. Small cleanup in SchedulerApp. (Todd Lipcon via mahadev) - Merging r1206921 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206924 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:45:02 +00:00
Mahadev Konar f0c0a094ff MAPREDUCE-3371. Review and improve the yarn-api javadocs. (Ravi Prakash via mahadev) - Merging r1206899 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206909 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:17:09 +00:00