Commit Graph

128 Commits

Author SHA1 Message Date
Robert Joseph Evans 0f0204c3c2 svn merge -c 1331012. FIXES: MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331014 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:28:18 +00:00
Thomas Graves bb9cfbb052 merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
Robert Joseph Evans 7f40acc947 svn merge -c 1330552 FIXES: MAPREDUCE-4194. ConcurrentModificationError in DirectoryCollection (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:53:15 +00:00
Robert Joseph Evans 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Siddharth Seth ab8ea1db58 Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:55:53 +00:00
Thomas Graves ef5ca103f6 merge -r 1308975:1308976 from trunk. FIXES: MAPREDUCE-4012
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308985 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 15:39:35 +00:00
Siddharth Seth 55639bea52 Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:04:21 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Arun Murthy 708795ba15 Removed some logs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304100 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 22:21:11 +00:00
Devaraj Das 94249757ee merge -r1301819:1301820 from trunk onto branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301821 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 23:23:13 +00:00
Robert Joseph Evans 9b32863cb8 svn merge -c 1297796 from trunk to branch-0.23 FIXES: MAPREDUCE-3977. LogAggregationService leaks log aggregator objects (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297797 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:46:02 +00:00
Arun Murthy 3d48d8cf6e Merge -c 1297310 from trunk to branch-0.23 to fix MAPREDUCE-3034. Ensure NodeManager reboots itself on direction from ResourceManager. Contributed by Devaraj K & Eric Payne.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297311 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 00:52:58 +00:00
Alejandro Abdelnur b0547e89e7 Merge -r 1295244:1295245 from trunk to branch. FIXES: MAPREDUCE-3728
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295246 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 20:06:19 +00:00
Thomas Graves 90c6dd8468 merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 15:51:55 +00:00
Vinod Kumar Vavilapalli 75b043d69a MAPREDUCE-3922. Fixed build to not compile 32bit container-executor binary by default on all platforms. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1294446 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294448 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 02:43:15 +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
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
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
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 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
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 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
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
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 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
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
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
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
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
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
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
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 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
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
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
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 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
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
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
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 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 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