Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,169 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1221 Commits

Author SHA1 Message Date
Alejandro Abdelnur 2ed6ce3bfb MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 22:14:15 +00:00
Vinod Kumar Vavilapalli 44a9273286 MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1482208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 05:52:46 +00:00
Siddharth Seth 1f922d3c51 merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 04:13:00 +00:00
Vinod Kumar Vavilapalli 6706e58f61 MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1482175 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 02:50:27 +00:00
Alejandro Abdelnur 7db8233722 MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482143 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 23:09:05 +00:00
Vinod Kumar Vavilapalli 3691cf65af MAPREDUCE-5208. Bug-fix on branch-2 - tests weren't compiling. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482091 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 20:38:18 +00:00
Vinod Kumar Vavilapalli 99275f172a MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv) 
svn merge --ignore-ancestry -c 1481695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 03:36:15 +00:00
Vinod Kumar Vavilapalli 621db3a3cc MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1481657 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481658 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-12 21:59:48 +00:00
Vinod Kumar Vavilapalli 2594db460f YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth. 
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1481205 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:51:32 +00:00
Alejandro Abdelnur c56c50df3f MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 20:11:33 +00:00
Vinod Kumar Vavilapalli 6aa0edc793 YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong. 
MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480529 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 05:32:52 +00:00
Vinod Kumar Vavilapalli fc693ff519 YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong. 
MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480494 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480495 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 22:54:07 +00:00
Vinod Kumar Vavilapalli c175e3f4aa Fixing release date for 2.0.4-alpha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480482 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 22:02:00 +00:00
Vinod Kumar Vavilapalli 4a0965323c MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1480474 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480476 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:43:40 +00:00
Christopher Douglas 5cf0e57849 MAPREDUCE-5209. Fix units in a ShuffleScheduler log message. 
Contributed by Tsuyoshi OZAWA


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480472 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:36:43 +00:00
Vinod Kumar Vavilapalli 2f7c04f53a MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1480394 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 18:29:10 +00:00
Vinod Kumar Vavilapalli 486391f766 YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong. 
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479680 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 19:20:02 +00:00
Vinod Kumar Vavilapalli fb8d3fb0e4 MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1479016 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479018 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-04 00:29:34 +00:00
Vinod Kumar Vavilapalli 0b64df0630 YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1478594 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 22:45:30 +00:00
Thomas White 0411165008 Merge -r 1478421:1478422 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478424 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 16:00:15 +00:00
Aaron Myers 96be135ffe MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478251 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 02:00:44 +00:00
Vinod Kumar Vavilapalli 868362c9b1 MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1477889 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 00:44:13 +00:00
Vinod Kumar Vavilapalli e11dd72dc1 MAPREDUCE-5179. Fix unit test in TestHSWebServices which fails when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah. 
svn merge --ignore-ancestry -c 1476835 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476836 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-28 21:03:01 +00:00
Vinod Kumar Vavilapalli ffe3368d94 YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He. 
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 19:08:44 +00:00
Vinod Kumar Vavilapalli a1fe9a0c9f YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah. 
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1475636 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 05:45:15 +00:00
Siddharth Seth b392a65e2e merge MAPREDUCE-5181 from trunk. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471817 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 02:51:08 +00:00
Arun Murthy c281269d0e Merge -c 1471796 from trunk to branch-2 to fix MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471797 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 00:55:00 +00:00
Arun Murthy 1fb58d2322 Merge -c 1471556 from trunk to branch-2 to fix MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471557 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 17:39:28 +00:00
Robert Joseph Evans 8b23e7e10c svn merge -c 1471424 FIXES: MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471429 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:23:00 +00:00
Vinod Kumar Vavilapalli 2dfecb78e5 YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong. 
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:01:08 +00:00
Thomas White d53afdb144 Merge -r 1470693:1470694 from trunk to branch-2. Fixes: MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470696 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-22 20:09:44 +00:00
Arun Murthy b65a090174 Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 19:19:16 +00:00
Thomas Graves d5a1fb4663 MAPREDUCE-5147. Maven build should create hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470038 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 20:55:05 +00:00
Vinod Kumar Vavilapalli 1bfb6af49f YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong. 
MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1469657 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 01:34:04 +00:00
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
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 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
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
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
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