Commit Graph

4474 Commits

Author SHA1 Message Date
Alejandro Abdelnur d516caf788 MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469589 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 21:43:59 +00:00
Kihwal Lee 3ef924019d svn merge -c 1375790 Merging from trunk to branch-2 to fix HADOOP-8711.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469565 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:54:07 +00:00
Vinod Kumar Vavilapalli 0df869e1f7 MAPREDUCE-5152. Make MR App to simply pass through the container from RM instead of extracting and populating information itself to start any container. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1469544 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469545 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:14:22 +00:00
Alejandro Abdelnur df24059512 MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469524 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:53:36 +00:00
Alejandro Abdelnur 15d5394221 YARN-482. FS: Extend SchedulingMode to intermediate queues. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469511 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:13:36 +00:00
Vinod Kumar Vavilapalli 27bef76501 YARN-585. Fix failure in TestFairScheduler#testNotAllowSubmitApplication caused by YARN-514. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1469492 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469494 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 17:49:57 +00:00
Harsh J 8f02b5951b HADOOP-9450. HADOOP_USER_CLASSPATH_FIRST is not honored; CLASSPATH is PREpended instead of APpended. Contributed by Chris Nauroth and Harsh J. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469215 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 08:01:08 +00:00
Alejandro Abdelnur 9b4f1a0c10 MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469096 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:15:22 +00:00
Alejandro Abdelnur 4198eaf00d YARN-476. ProcfsBasedProcessTree info message confuses users. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469094 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:12:37 +00:00
Alejandro Abdelnur dc21be9026 YARN-518. Fair Scheduler's document link could be added to the hadoop 2.x main doc page. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469092 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:06:30 +00:00
Bikas Saha 2108a35d28 Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469064 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:32:15 +00:00
Bikas Saha 039d673794 Merge -c r1469059 from trunk to branch-2 for YARN-514. Delayed store operations should not result in RM unavailability for app submission (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:30:48 +00:00
Suresh Srinivas b3941c65e8 HDFS-4695. Merge 1469015 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469018 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:14:16 +00:00
Vinod Kumar Vavilapalli 7f3fd5f03d Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468743 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:22:34 +00:00
Vinod Kumar Vavilapalli 3d2430fad1 YARN-500. Fixed YARN webapps to not roll-over ports when explicitly asked to use non-ephemeral ports. Contributed by Kenji Kikushima.
svn merge --ignore-ancestry -c 1468739 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468740 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:17:49 +00:00
Kihwal Lee 88086534a8 svn merge -c 1468629 Merging from trunk to branch-2 to fix MR-5065.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468631 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 22:03:40 +00:00
Thomas Graves fd6956c3bd MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468484 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 16:12:25 +00:00
Suresh Srinivas 16d41cabf9 HDFS-4693. Merge 1468457 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468469 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 15:39:20 +00:00
Vinod Kumar Vavilapalli 8cc3b081fa YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza.
MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1468276 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 23:55:26 +00:00
Robert Joseph Evans a7fba8fcd7 svn merge -c 1468232 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468235 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 21:36:31 +00:00
Suresh Srinivas 5a98de170c HADOOP-9473. Merge 1467694 and 1467696 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467697 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 20:27:50 +00:00
Konstantin Shvachko a59b953861 HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467535 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 01:36:46 +00:00
Arun Murthy 8acaea0028 YARN-412. Pushing to 2.0.5-beta only.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467471 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 21:20:45 +00:00
Konstantin Shvachko a24b7fc1a6 HADOOP-9211. Set default max heap size in HADOOP_CLIENT_OPTS to 512m in order to avoid OOME. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467390 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 18:11:28 +00:00
Kihwal Lee c9b9ebde1d svn merge -c 1467307 Merging from trunk to branch-2 to fix HDFS-4477.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467308 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 15:19:59 +00:00
Arun Murthy ac7d455a0f Merge -c 1467244 from trunk to branch-2 to fix YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather than its host:port during scheduling which caused incorrect locality for containers. Contributed by Roger Hoover.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467245 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 12:15:17 +00:00
Konstantin Shvachko 7e12ea395e MAPREDUCE-4985. Add compression option to TestDFSIO usage. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467146 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:50:15 +00:00
Vinod Kumar Vavilapalli 23dd901a48 HADOOP-9471. Merged into 2.0.4-alpha. Fixing CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467138 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:26:04 +00:00
Vinod Kumar Vavilapalli 3a1ab1bc98 (Missing commit message from the previous commit)
YARN-486. Changed NM's startContainer API to accept Container record given by RM as a direct parameter instead of as part of the ContainerLaunchContext record. Contributed by Xuan Gong.
MAPREDUCE-5139. Update MR AM to use the modified startContainer API after YARN-486. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467131 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:05:24 +00:00
Vinod Kumar Vavilapalli a84c8bcbd4 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68 2013-04-11 23:04:09 +00:00
Vinod Kumar Vavilapalli 0c54bb343d MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1467124 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467126 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:55:52 +00:00
Vinod Kumar Vavilapalli ff4b1aa99e MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1467120 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467122 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:28:53 +00:00
Vinod Kumar Vavilapalli 51dc407f30 YARN-319. Submitting a job to a fair scheduler queue for which the user does not have permission causes the client to wait forever. Contributed by Shenhong.
svn merge --ignore-ancestry -c 1437336 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467110 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:00:10 +00:00
Jason Darrell Lowe d990c2f413 svn merge -c 1467090 FIXES: HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit tests. Contributed by Vadim Bondarev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467099 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 21:25:10 +00:00
Konstantin Shvachko 63894e3a39 MAPREDUCE-4981. Add WordMean, WordMedian, WordStandardDeviation to ExamplesDriver. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467078 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:32:14 +00:00
Jason Darrell Lowe 19983df147 svn merge -c 1467072 FIXES: HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests. Contributed by Vadim Bondarev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467075 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:27:54 +00:00
Thomas Graves 61ce78582f Preparing for release 0.23.7
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467070 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:09:26 +00:00
Jason Darrell Lowe 74880e24c5 svn merge -c 1467061 FIXES: MAPREDUCE-5136. TestJobImpl->testJobNoTasks fails with IBM JAVA. Contributed by Amir Sanjar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 19:18:55 +00:00
Jason Darrell Lowe 9f3feed745 MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error. Contributed by Thomas Graves
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466952 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 16:29:34 +00:00
Alejandro Abdelnur 5b63830211 MAPREDUCE-5098. Fix findbugs warnings in gridmix. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466872 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:08:55 +00:00
Alejandro Abdelnur a7d2d7cfc7 MAPREDUCE-5113. Streaming input/output types are ignored with java mapper/reducer. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466870 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:04:29 +00:00
Siddharth Seth cdbfce55df Fixes to MR CHANGES.txt to bring jiras under the correct release. At least 2.0.4 onwards in sync with trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466779 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 07:23:07 +00:00
Siddharth Seth 422133edf7 merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 05:02:45 +00:00
Alejandro Abdelnur fc570c127a HADOOP-9471. hadoop-client wrongfully excludes jetty-util JAR, breaking webhdfs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466764 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 04:06:11 +00:00
Vinod Kumar Vavilapalli d6f8a7f7ee YARN-539. Addressed memory leak of LocalResource objects NM when a resource localization fails. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466756 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466757 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:08:49 +00:00
Vinod Kumar Vavilapalli 81a684ebd3 YARN-495. Changed NM reboot behaviour to be a simple resync - kill all containers and re-register with RM. Contributed by Jian He.
svn merge --ignore-ancestry -c 1466752 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466753 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:01:44 +00:00
Suresh Srinivas 71a4677b36 HDFS-4679. Merge 1466721 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466729 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 23:17:23 +00:00
Luke Lu 9be0d30af4 HADOOP-9467. Metrics2 record filter should check name as well as tags. (Ganeshan Iyler via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466381 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 08:34:29 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
Todd Lipcon a27b04e11a HDFS-4643. Fix flakiness in TestQuorumJournalManager. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466252 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 21:34:03 +00:00