Commit Graph

854 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli e591c4f4dc MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1379146 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:04:05 +00:00
Thomas White 9f94b89742 Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 17:14:07 +00:00
Thomas White ebbb304022 Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:02:31 +00:00
Robert Joseph Evans a88454abb7 MAPREDUCE-4600. TestTokenCache.java from MRV1 no longer compiles (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378267 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 18:53:53 +00:00
Vinod Kumar Vavilapalli 14b1cf459b MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 02:05:25 +00:00
Siddharth Seth a1c556ca19 merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:41:03 +00:00
Alejandro Abdelnur 2ff2b79e33 MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 23:38:21 +00:00
Alejandro Abdelnur 6e831b0f5e MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 00:24:36 +00:00
Aaron Myers 0490537635 MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 22:45:30 +00:00
Alejandro Abdelnur d7a90bc552 MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:23:09 +00:00
Robert Joseph Evans 1ee0c23b39 svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 17:47:08 +00:00
Robert Joseph Evans f3f8edbd10 svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 15:21:30 +00:00
Thomas White 832e7c6dc3 Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 13:27:24 +00:00
Alejandro Abdelnur fc783dcc1e MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 23:11:00 +00:00
Thomas Graves 6f516ea1bf merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:50:21 +00:00
Robert Joseph Evans 4705652915 svn merge -c 1371325 FIXES: MAPREDUCE-3782. teragen terasort jobs fail when using webhdfs:// (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371332 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 17:39:37 +00:00
Alejandro Abdelnur 88593c443d Merge -r 1370119:1370120 from trunk to branch. FIXES: MAPREDUCE-4484
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370121 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 05:16:15 +00:00
Alejandro Abdelnur 6c4b4e19b3 Merge -r 1370117:1370118 from trunk to branch. FIXES: MAPREDUCE-4494
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370119 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 05:12:08 +00:00
Alejandro Abdelnur 2a178a8d0b Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 18:15:35 +00:00
Jonathan Turner Eagles 054dd2d39c svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 20:42:18 +00:00
Siddharth Seth f7545f076e Merge MAPREDUCE-3289 from trunk. Make use of fadvise in the NM's shuffle handler. (Contributed by Todd Lipcon and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368722 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 21:57:42 +00:00
Thomas Graves 6b3c8934f3 merge -r 1368293:1368294 from trunk. FIXES: MAPREDUCE-4504
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368296 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 22:20:59 +00:00
Jonathan Turner Eagles d40b6be2f5 svn merge -c 1367789 FIXES: MAPREDUCE-4234. SortValidator.java is incompatible with multi-user or parallel use (due to a /tmp file with static name) (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367793 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 21:45:45 +00:00
Robert Joseph Evans bc65eefdd3 svn merge -c 1367783 FIXES: MAPREDUCE-4444. nodemanager fails to start when one of the local-dirs is bad (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367784 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 21:09:43 +00:00
Thomas Graves 66d468eece merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:53:45 +00:00
Robert Joseph Evans 6817f87461 svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367729 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:50:11 +00:00
Robert Joseph Evans e265f69a18 svn merge -c 1367719 FIXES: MAPREDUCE-4492. Configuring total queue capacity between 100.5 and 99.5 at perticular level is sucessfull (Mayank Bansal via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367720 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:35:39 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Robert Joseph Evans 6fe821a14a svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:09:49 +00:00
Thomas Graves a1a7ee23f7 merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 14:49:07 +00:00
Thomas Graves ca7732aae9 merge -r 1367538:1367539 from trunk. FIXES: MAPREDUCE-4375
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367540 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:40:39 +00:00
Alejandro Abdelnur f86353ba09 Merge -r 1367351:1367352 from trunk to branch. FIXES: MAPREDUCE-4342
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367353 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 22:57:30 +00:00
Thomas Graves 4850bf623c merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 01:48:54 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Alejandro Abdelnur 4ded6d2c01 Merge -r 1365321:1365322 from trunk to branch. FIXES: MAPREDUCE-4465
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365323 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 22:09:04 +00:00
Thomas Graves dce4a7c765 merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 19:28:43 +00:00
Arun Murthy 95a5222e4a Merge -c 1365185 from trunk to branch-2 to fix MAPREDUCE-4438. Add a simple, generic client to run 'easy' AMs in YARN. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365190 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 17:40:34 +00:00
Robert Joseph Evans f7a722c38f svn merge -c 1364764 FIXES: MAPREDUCE-3893. allow capacity scheduler configs max-apps and max-am-pct per queue (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364765 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 19:32:59 +00:00
Alejandro Abdelnur 3298bb541c Merge -r 1364019:1364020 from trunk to branch. FIXES: MAPREDUCE-987
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364117 13f79535-47bb-0310-9956-ffa450edef68
2012-07-21 16:26:00 +00:00
Thomas Graves 45c42817ca svn merge --change -1363455 for reverting MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:21:09 +00:00
Thomas Graves 5568bf8260 merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:22:03 +00:00
Alejandro Abdelnur 52fa40b8ba Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363163 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 22:43:52 +00:00
Robert Joseph Evans e69e5c9cd3 svn merge -c 1363067 FIXES: MAPREDUCE-4157. ResourceManager should not kill apps that are well behaved (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363070 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 19:44:22 +00:00
Alejandro Abdelnur bd359a1a8e Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:37:38 +00:00
Alejandro Abdelnur c22cddbad1 Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 23:34:38 +00:00
Daryn Sharp 70f330d14c svn merge -c 1362618 FIXES: MAPREDUCE-4448. Fix NM crash during app cleanup if aggregation didn't
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362621 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:46:44 +00:00
Robert Joseph Evans f8bd54b16a svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:15:30 +00:00
Robert Joseph Evans 71b35e827c svn merge -c 1362608 FIXES: MAPREDUCE-4283. Display tail of aggregated logs by default (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362609 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:08:26 +00:00
Robert Joseph Evans 796272a502 svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:51:52 +00:00
Arun Murthy 1f299865c0 Merge -c 1362332 from trunk to branch-2 to fix MAPREDUCE-4440. Changed SchedulerApp and SchedulerNode to be a minimal interface to allow schedulers to maintain their own.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362333 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 01:49:30 +00:00