Commit Graph

373 Commits

Author SHA1 Message Date
Thomas Graves d31abfe3f8 merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Thomas Graves 15d3d52f1b merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:10:34 +00:00
Robert Joseph Evans ea165d6e91 svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:57:44 +00:00
Robert Joseph Evans 6514ecce13 svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:05:36 +00:00
Robert Joseph Evans cbbddcb3ca svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:58:36 +00:00
Robert Joseph Evans 7c087c4a9b svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:51:07 +00:00
Thomas Graves 0d388cd1f4 merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:13:11 +00:00
Thomas Graves 93af1a43be merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:18:55 +00:00
Robert Joseph Evans 8b39213000 svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:30:38 +00:00
Robert Joseph Evans 581f9b4ca2 svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 15:20:06 +00:00
Arun Murthy 96d4812433 Merge -c 1306736 from trunk to branch-2 to fix MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306737 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 07:47:55 +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
Robert Joseph Evans 4c0306714b svn merge -c 1301551 from trunk to branch-0.23 FIXES MAPREDUCE-4010. TestWritableJobConf fails on trunk (tucu via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301553 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 14:40:32 +00:00
Alejandro Abdelnur fbae7714cf Merge -r 1300749:1300750 from trunk to branch. FIXES: MAPREDUCE-4007
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300751 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 22:03:32 +00:00
Vinod Kumar Vavilapalli 07e7ad5e86 MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1299047 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 21:14:28 +00:00
Vinod Kumar Vavilapalli c383843732 MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1298978 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 18:55:02 +00:00
Alejandro Abdelnur a7899dae53 Merge -r 1297292:1297293 from trunk to branch. FIXES: MAPREDUCE-3952
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297299 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 00:00:36 +00:00
Vinod Kumar Vavilapalli f942f395c1 MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1296721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 23:42:39 +00:00
Siddharth Seth 3e3e6770ca merge MAPREDUCE-3896 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:29:14 +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
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
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 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
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
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
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
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
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 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
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
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
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
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
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 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
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
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
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
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
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
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
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
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
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
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
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
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
Vinod Kumar Vavilapalli 88fe1ae2ed MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah.
svn merge -c 1213987 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213989 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:42:50 +00:00
Mahadev Konar 04cb16ced7 MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev) - Merging r1213504 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213505 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:58:22 +00:00
Thomas White df4a1a9aab Merge -r 1209280:1209281 from trunk to branch-0.23. Fixes: MAPREDUCE-3369
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209283 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 22:34:10 +00:00
Siddharth Seth 8031aef007 merge MAPREDUCE-3169 amendment (Deprecate MiniMRCluster) from trunk. Constributed by Ahmed Radwan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209239 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:09:25 +00:00
Siddharth Seth 463e78db70 merge MAPREDUCE-3443 from trunk. Contributed by Mahadev Konar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209232 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 20:43:34 +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
Arun Murthy 7467e23b41 Merge -c 1205628 from trunk to branch-0.23 to fix MAPREDUCE-3265.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205629 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:06:47 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +00:00
Mahadev Konar df0d4c1d5e MAPREDUCE-3434. Nightly build broken (Hitesh Shah via mahadev) - merging r1204638 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204641 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 18:28:12 +00:00
Alejandro Abdelnur c36a44d11b Merge -r 1203940:1203941 from trunk to branch. FIXES: HADOOP-7590
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203945 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 01:38:22 +00:00
Alejandro Abdelnur a24139e043 Merge -r 1203410:1203411 from trunk to branch. FIXES: MAPREDUCE-3415
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203415 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 23:10:37 +00:00
Alejandro Abdelnur 124d34995a Merge -r 1203370:1203371 from trunk to branch. FIXES: MAPREDUCE-3169
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203402 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 22:48:13 +00:00
Vinod Kumar Vavilapalli 7b8e41d6a1 MAPREDUCE-3407. Fixed pom files to refer to the correct MR app-jar needed by the integration tests. Contributed by Hitesh Shah.
svn merge -c r1202766 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202768 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 16:31:37 +00:00
Vinod Kumar Vavilapalli 838bb254fe MAPREDUCE-3370. Fixed MiniMRYarnCluster and related tests to not use a hard-coded path for the mr-app jar. Contributed by Ahmed Radwan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200776 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 08:53:47 +00:00
Vinod Kumar Vavilapalli 5ac8276168 MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George.
svn merge -c r1200484 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200485 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:21:29 +00:00
Vinod Kumar Vavilapalli b7ff3d01b5 MAPREDUCE-3280. Removed the unnecessary job user-name configuration in mapred-site.xml. (vinodkv)
svn merge -c r1200441 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200444 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 17:31:14 +00:00
Mahadev Konar 4657411161 MAPREDUCE-3291. App fail to launch due to delegation token not found in cache (Robert Evans via mahadev) -Merging r1198583 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198585 13f79535-47bb-0310-9956-ffa450edef68
2011-11-06 23:04:35 +00:00
Vinod Kumar Vavilapalli 4b4b1c89cc MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth.
svn merge -c r1195349 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195353 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:08 +00:00
Alejandro Abdelnur 954b0ff8ab Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190671 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:30:05 +00:00
Alejandro Abdelnur 073139bb57 Merge -r 1185966:1185967 from trunk to branch. FIXES: MAPREDUCE-3199
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190667 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:14:55 +00:00
Alejandro Abdelnur 0eba9bcc06 Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:36:55 +00:00
Vinod Kumar Vavilapalli fc8079e054 MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the JobHistoryServer. Contributed by Siddharth Seth.
svn merge -c r1190174 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:52:40 +00:00
Vinod Kumar Vavilapalli 28676b5345 MAPREDUCE-2986. Fixed MiniYARNCluster to support multiple NodeManagers. Contributed by Anupam Seth.
svn merge -c r1189721 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189723 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:44:57 +00:00
Arun Murthy b211fc72cc Merge -c 1189036 from trunk to branch-0.23 to fix for MAPREDUCE-2858.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189037 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 06:32:26 +00:00
Mahadev Konar 383b8ed9d9 MAPREDUCE-3250. When AM restarts, client keeps reconnecting to the new AM and prints a lots of logs. (vinodkv via mahadev) - Merging r1189023 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189024 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 04:35:40 +00:00
Mahadev Konar ddccefbefb MAPREDUCE-2746. Yarn servers can't communicate with each other with hadoop.security.authorization set to true (acmurthy via mahadev) - Merging r1188522 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:12:14 +00:00
Vinod Kumar Vavilapalli 1605fb7dbc MAPREDUCE-3058. Fixed MR YarnChild to report failure when task throws an error and thus prevent a hanging task and job. (vinodkv)
svn merge -c r1187654 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187655 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:17:25 +00:00
Mahadev Konar cbd1258918 MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev) - Merging r1187556 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187558 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:38:45 +00:00
Mahadev Konar 1edb5c8f9e MAPREDUCE-3163. JobClient spews errors when killing MR2 job. (mahadev) - Merging r1187491 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187492 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:38:26 +00:00
Vinod Kumar Vavilapalli 9a8b923418 MAPREDUCE-3104. Implemented Application-acls. (vinodkv)
svn merge -c r1186748 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186754 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 12:01:54 +00:00
Arun Murthy dfb1c18558 Merge -c 1185887 from trunk to branch-0.23 to complete fix for MAPREDUCE-3165.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185888 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:46:15 +00:00
Mahadev Konar e2edc8f20b MAPREDUCE-2840. mr279 TestUberAM.testSleepJob test fails. (jonathan eagles via mahadev) - Merging r1184971 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184972 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 01:24:06 +00:00
Arun Murthy c2ae3d6e36 Merge -c 1182616 from trunk to branch-0.23 to fix MAPREDUCE-2789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:29:53 +00:00
Arun Murthy 8d0daf8843 Merge -c 1181310 from trunk to branch-0.23 to fix MAPREDUCE-3158.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181311 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 00:27:39 +00:00
Arun Murthy fce52877b1 Merge -c 1180214 from trunk to branch-0.23 to fix MAPREDUCE-3033.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180216 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:40:40 +00:00
Vinod Kumar Vavilapalli a9f2a60872 MAPREDUCE-2913. svn merge -c r1179319 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179326 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 17:10:38 +00:00
Vinod Kumar Vavilapalli 8ccbd7d135 MAPREDUCE-2907. svn merge -c r1179178 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179181 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:58:41 +00:00
Vinod Kumar Vavilapalli c4148c8db1 MAPREDUCE-3013. svn merge -c r1179174 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:47:00 +00:00
Arun Murthy 9efc5089de Merge -r 1178630:1178631 from trunk to branch-0.23 to fix MAPREDUCE-2792.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178633 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:23:04 +00:00
Vinod Kumar Vavilapalli 908f1d5d01 MAPREDUCE-3098. svn merge -c r1177633 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177639 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:54:53 +00:00
Arun Murthy f99d1f7fde Merge -r 1177486:1177487 from trunk to branch-0.23 to fix MAPREDUCE-2791.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177490 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 03:10:57 +00:00
Arun Murthy e6f5bf6dd8 Merge -r 1176761:1176762 from trunk to branch-0.23 to fix MAPREDUCE-3078.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176763 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 07:32:22 +00:00
Arun Murthy f67abbdbf6 Merge -r 1176714:1176715 from trunk to branch-0.23 to fix MAPREDUCE-3041.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176718 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 04:25:19 +00:00
Mahadev Konar 8203f69ebc MAPREDUCE-3054. Unable to kill submitted jobs. (mahadev) - Merging r1176600 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176604 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 20:36:20 +00:00
Vinod Kumar Vavilapalli 6b6e177b70 MAPREDUCE-2952. svn merge -c r1175403 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175408 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 14:54:00 +00:00
Vinod Kumar Vavilapalli 2377d1697f MAPREDUCE-3055. svn merge -c r1174785 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 14:12:27 +00:00
Vinod Kumar Vavilapalli c679348aa5 MAPREDUCE-2754. svn merge -c r1174194 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174195 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 15:18:50 +00:00
Vinod Kumar Vavilapalli 01da4430d2 MAPREDUCE-2880. svn merge -c r1173783 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 18:52:27 +00:00
Vinod Kumar Vavilapalli 83d9dc9f8c MAPREDUCE-2970. svn merge -c r1173534 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173536 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 09:15:39 +00:00
Vinod Kumar Vavilapalli d4c7bb64bf MAPREDUCE-3040. svn merge -c r1172929 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172984 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 06:04:28 +00:00
Arun Murthy 6c784e74fd Merge -r 1172892:1172893 from trunk to branch-0.23 to fix MAPREDUCE-3004.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172895 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 23:18:10 +00:00
Vinod Kumar Vavilapalli 3ee4f465e0 MAPREDUCE-2925. svn merge -c r1172587 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172588 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 12:28:09 +00:00
Mahadev Konar 8c99dc8435 MAPREDUCE-1788. o.a.h.mapreduce.Job shouldn't make a copy of the JobConf. (Arun Murthy via mahadev) - Merging r1172171 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172172 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 02:52:44 +00:00
Arun Murthy c09246b2e8 Fixed broken merge for MAPREDUCE-2987
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171924 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 07:16:47 +00:00
Arun Murthy 9146f43c8d Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171902 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 05:53:28 +00:00
Vinod Kumar Vavilapalli 38e0f786b2 MAPREDUCE-3007. svn merge -c r1171051 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171057 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 11:21:03 +00:00
Mahadev Konar 90a5181501 MAPREDUCE-2899. Replace major parts of ApplicationSubmissionContext with a ContainerLaunchContext (Arun Murthy via mahadev) - Merging r1170459 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170460 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 07:29:45 +00:00
Arun Murthy 677c212467 Merge -r 1169979:1169980 from trunk to branch-0.23 to fix MAPREDUCE-2896.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169981 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 00:07:09 +00:00
Mahadev Konar 5bb361cee4 MAPREDUCE-2971. ant build mapreduce fails protected access jc.displayJobList (jobs) (Thomas Graves via mahadev) - merging 1167383 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167384 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 22:45:41 +00:00
Arun Murthy 4cc34c9cdd Merge -r 1167330:1167331 from trunk to branch-0.23 to fix MAPREDUCE-2975.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167332 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 19:01:39 +00:00
Arun Murthy 42dbcbb4d8 Merge -r 1166974:1166975 from trunk to branch-0.23 to fix MAPREDUCE-2963.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166976 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 03:01:44 +00:00
Arun Murthy 778e65aa74 Merge -r 1166965:1166966 from trunk to branch-0.23 to fix MAPREDUCE-2937.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166967 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:15:20 +00:00
Arun Murthy 3dd8d9476b Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166957 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 01:58:40 +00:00
Arun Murthy dc896c8bc6 Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166840 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:28:14 +00:00
Arun Murthy e7c0ee77c6 Merge -r 1165929:1165930 from trunk to branch-0.23 to fix MAPREDUCE-2800.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165932 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 23:37:04 +00:00
Vinod Kumar Vavilapalli cb8d102f97 MAPREDUCE-2716. svn merge -c r1164805 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164807 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 06:46:45 +00:00
Vinod Kumar Vavilapalli 464486bee3 MAPREDUCE-2652. svn merge -c r1163585 --ignore-ancestry trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163626 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 14:07:25 +00:00
Arun Murthy f78a682166 Merge -r 1162490:1162491 from trunk to branch-0.23 to fix MAPREDUCE-2893.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162492 13f79535-47bb-0310-9956-ffa450edef68
2011-08-28 10:39:03 +00:00
Mahadev Konar 7c85f33ce1 MAPREDUCE-2877. Add missing Apache license header in some files in MR and also add the rat plugin to the poms. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161650 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 17:16:36 +00:00
Sharad Agarwal f2b91a8367 MAPREDUCE-2807. Fix AM restart and client redirection. Contributed by Sharad Agarwal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161408 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 06:35:58 +00:00
Arun Murthy cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161332 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 00:14:24 +00:00