Commit Graph

681 Commits

Author SHA1 Message Date
Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:26:07 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Thomas White f537469c7e Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 00:11:53 +00:00
Siddharth Seth d550503dbb Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
Thomas White cb3d6c3d98 Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
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
Siddharth Seth 462f9a5249 MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Siddharth Seth 50c13a44af merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00
Siddharth Seth 40497a9d04 merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:52:13 +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 3cf79f4c7e svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 21:31:41 +00:00
Robert Joseph Evans b04f23fc96 svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
Tsz-wo Sze b46380e463 svn merge -c 1311959 from trunk for MAPREDUCE-4057.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311960 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:50:09 +00:00
Robert Joseph Evans 07321a677c svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +00:00
Thomas Graves ce9bdceac7 merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:13:09 +00:00
Siddharth Seth 5f535af454 Merge MAPREDUCE-3869 from trunk. Fix classpath for DistributedShell application. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311524 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:02:57 +00:00
Thomas White de5069a6a1 Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311521 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 23:35:21 +00:00
Robert Joseph Evans f9e39d057e svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 21:54:22 +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 34ed535299 svn merge -c 1310528 from trunk. FIXES: MAPREDUCE-4051. Remove the empty hadoop-mapreduce-project/assembly/all.xml file (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310529 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:10:11 +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
Robert Joseph Evans 401d4b3584 svn merge -c 1310056 from trunk. FIXES: MAPREDUCE-4073. CS assigns multiple off-switch containers when using multi-level-queues (Siddharth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310057 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:29:01 +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
Alejandro Abdelnur 98f0abb721 Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:25:18 +00:00
Todd Lipcon 3c7d74132b MAPREDUCE-4103. Fix HA docs for changes to shell command fencer args. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309535 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 18:46:28 +00:00
Robert Joseph Evans eee35a6972 svn merge -c 1309481 FIXES: MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309482 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 16:24:38 +00:00
Robert Joseph Evans 954327f770 svn merge -c 1309453 from trunk FIXES: MAPREDUCE-3082. Archive command take wrong path for input file with current directory (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309454 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:30:03 +00:00
Thomas Graves 378ed9b673 merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:12:24 +00:00
Alejandro Abdelnur 4bdf14f6c9 Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:57:41 +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
Thomas Graves 4a3e9514c3 merge -r 1309132:1309133 from trunk. FIXES: MAPREDUCE-4020
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309134 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 20:41:22 +00:00
Robert Joseph Evans 18a6e47b98 svn merge -c 1309108 from trunk. FIXES MAPREDUCE-3999. Tracking link gives an error if the AppMaster hasn't started yet (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:38:43 +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 e76f7b7330 svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:03:18 +00:00
Robert Joseph Evans c6c7055c83 MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 17:03: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
Robert Joseph Evans 463a8ca9a5 svn merge -c 1308957 from trunk. FIXES MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308958 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 14:49:01 +00:00
Robert Joseph Evans 8e3046a391 svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308930 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 14:21:02 +00:00
Robert Joseph Evans 97f328dc40 svn merge -c 1308566 from trunk. FIXES MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308568 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 21:07:47 +00:00
Thomas Graves ad9f93f7b5 merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 20:24:46 +00:00
Robert Joseph Evans 54a0b26231 svn merge -c 1308507 from trunk FIXES: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308509 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 19:54:46 +00:00
Robert Joseph Evans 271eacf32d Preping for 0.23.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308481 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 19:20:17 +00:00
Alejandro Abdelnur c1ccd60f74 Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:31:34 +00:00
Alejandro Abdelnur cf5dc702c9 Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307414 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 13:41:40 +00:00
Alejandro Abdelnur 4805df8366 Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 21:50:30 +00:00
Eli Collins 55d9276dd9 MAPREDUCE-3989. svn merge -c 1307102 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307103 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 20:55:21 +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