Commit Graph

1062 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
Vinod Kumar Vavilapalli 76d72db5eb YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:57:10 +00:00
Jason Darrell Lowe 45fa8302f4 MAPREDUCE-5086. MR app master deletes staging dir when sent a reboot command from the RM. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465674 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 16:12:32 +00:00
Arun Murthy b66abebca2 Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 05:33:41 +00:00
Thomas Graves 003ecf8137 MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465016 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 15:43:38 +00:00
Hitesh Shah 43ad7efb4c Porting fix for MAPREDUCE-5083 to 2.0.4-alpha. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464634 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 17:02:41 +00:00
Konstantin Boudnik 347d9f6b98 MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464147 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 18:35:31 +00:00
Vinod Kumar Vavilapalli 523e98d914 MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1463828 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:40:21 +00:00
Thomas Graves e9e576409c MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463808 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 01:47:31 +00:00
Robert Joseph Evans ca4b6ee8c6 Reverted MAPREDUCE-4974 because of test failures.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:15:08 +00:00
Robert Joseph Evans f47bdbded7 svn merge -c 1463221 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@1463222 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 17:47:19 +00:00
Thomas White b1c781b2be MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:42:32 +00:00
Thomas Graves 0f66ba0b50 MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed. (Ravi Gummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461296 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 20:10:04 +00:00
Thomas Graves 257b263802 MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461289 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:54:51 +00:00
Thomas Graves 922c8ff997 MAPREDUCE-4356. [Rumen] Provide access to the method ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461277 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:26:36 +00:00
Thomas Graves 291a20960b MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map only jobs. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:21:43 +00:00
Thomas Graves 8f43934e99 MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461272 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:08:26 +00:00
Thomas Graves e9440d688e MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running tasks in Gridmix. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461269 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:00:53 +00:00
Siddharth Seth 6e9e2f0c7f MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:18:44 +00:00
Thomas Graves 57f91f9541 MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461243 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:00:30 +00:00
Thomas Graves 288393399a MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the trace contains null taskStatus for a task. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461242 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:52:40 +00:00
Thomas Graves 67b93ebb23 MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter is wrong when compressed input is used.(ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461236 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:42:29 +00:00
Thomas Graves 1f988b777c MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input data directory already exists and -generate opton is erate opton is
+    given.(ravi

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461233 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:29:26 +00:00
Thomas Graves 9a217a56dc MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster job submission. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461212 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:35:58 +00:00
Robert Joseph Evans 4bc46b766d svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 14:17:59 +00:00
Vinod Kumar Vavilapalli 7410551629 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1460923 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 22:34:45 +00:00
Hitesh Shah c983b07753 MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459935 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 19:14:07 +00:00
Siddharth Seth 7892e1aabd merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 21:57:12 +00:00
Robert Joseph Evans 05fabc2013 svn merge -c 1458906 FIXES: MAPREDUCE-4972. Coverage fixing for org.apache.hadoop.mapreduce.jobhistory (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458915 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 16:11:58 +00:00
Tsz-wo Sze aa874f3952 svn merge -c 1458749 from trunk for moving MAPREDUCE-5075 to 2.0.5-beta in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458753 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:49:54 +00:00
Tsz-wo Sze 84664ccde2 svn merge -c 1458741 from trunk for MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream does not close the wrapped InputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458747 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:43:21 +00:00
Alejandro Abdelnur 35bc29813f Reverting MAPREDUCE-5028 (commit 1457919)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 18:00:38 +00:00
Jonathan Turner Eagles 3fdeec0bd3 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 15:48:36 +00:00
Alejandro Abdelnur 1036f637cc MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 18:59:22 +00:00