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

1264 Commits

Author SHA1 Message Date
Arun Murthy 7246cf9b41 Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-02 22:55:31 +00:00
Vinod Kumar Vavilapalli 17476d2fa7 MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488625 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488626 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:22:27 +00:00
Vinod Kumar Vavilapalli 3de04e6401 MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488621 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488623 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:12:25 +00:00
Vinod Kumar Vavilapalli 41ed12124c YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He. 
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 21:45:24 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Konstantin Boudnik 44a72a119a Adding 2.0.5-alpha release to CHANGES.txt files of branch-2 
Also updating current version to 2.1.0-beta in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:32 +00:00
Vinod Kumar Vavilapalli 4e0ac70cea MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488458 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488459 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 03:59:23 +00:00
Vinod Kumar Vavilapalli 089b3edd0e MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488442 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488443 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:34:24 +00:00
Siddharth Seth cdab92d0c3 merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:15:53 +00:00
Vinod Kumar Vavilapalli 75a96a140a MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1488436 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488437 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 23:57:42 +00:00
Vinod Kumar Vavilapalli 297e916f41 MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488370 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 19:48:30 +00:00
Christopher Douglas 1711348e48 MAPREDUCE-5176. Add annotation for tagging tasks as responsive to 
preemption. Contributed by Carlo Curino, cdouglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 06:07:37 +00:00
Siddharth Seth 36ef457902 merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:18:50 +00:00
Vinod Kumar Vavilapalli 1a8872e1e0 MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1488060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli d95c5a23d9 MAPREDUCE-5261. Reverting the patch as it is no longer needed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 21:54:28 +00:00
Vinod Kumar Vavilapalli a099537780 YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth. 
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 20:19:53 +00:00
Siddharth Seth 0fb465cbc4 merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 05:01:40 +00:00
Vinod Kumar Vavilapalli 6cb1cf3d1a MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1487695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli 71cc411340 MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen. 
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 00:43:47 +00:00
Vinod Kumar Vavilapalli a2303831b4 MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1486271 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 22:38:14 +00:00
Suresh Srinivas fa88e4ea6e HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 00:09:12 +00:00
Konstantin Boudnik b8535c0ec1 Updating common and mapreduce CHANGES.txt with 2.0.4.1-alpha release 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486270 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-25 01:43:46 +00:00
Vinod Kumar Vavilapalli 6c5055fe92 YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 23:11:25 +00:00
Suresh Srinivas 599b00e087 MAPREDUCE-5191. Merge r1484575 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:47:19 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:29:49 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:37:58 +00:00
Suresh Srinivas 5e007776f6 MAPREDUCE-4987. Merge r1470003 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486106 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 16:19:53 +00:00
Suresh Srinivas 91084635f3 MAPREDUCE-4885. Merge r1467158 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 07:12:07 +00:00
Suresh Srinivas 02205fa797 HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:51:31 +00:00
Vinod Kumar Vavilapalli 004a9d5567 MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1485906 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:42:53 +00:00
Suresh Srinivas 7ba49c56aa Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:17:38 +00:00
Suresh Srinivas 84b91e1b01 HADOOP-9372. Merge r1453637 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485852 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:09:50 +00:00
Suresh Srinivas 3eb800f539 HADOOP-9373. Merge change r1453599 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:07:05 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 20:41:53 +00:00
Vinod Kumar Vavilapalli 35dc9545e1 YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal. 
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 18:02:45 +00:00
Vinod Kumar Vavilapalli 28822c2f64 MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1485491 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 23:13:19 +00:00
Vinod Kumar Vavilapalli f71593ae2c MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1485085 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 06:37:01 +00:00
Vinod Kumar Vavilapalli c28a0860e2 MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1485079 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485080 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 06:25:03 +00:00
Vinod Kumar Vavilapalli 89f809bdff MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1484992 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484993 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 22:01:02 +00:00
Vinod Kumar Vavilapalli 543bab20ed MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1484349 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484351 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-19 21:15:54 +00:00
Jason Darrell Lowe 759e518509 svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483976 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 20:26:13 +00:00
Vinod Kumar Vavilapalli d180262cf9 MAPREDUCE-5234. Change mapred.TaskReport and mapreduce.TaskReport for binary compatibility with mapred in 1.x but incompatible with 0.23.x. Contributed by Mayank Bansal. 
svn merge --ignore-ancestry -c 1483940 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 18:17:57 +00:00
Vinod Kumar Vavilapalli f0bd8da38b YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi. 
Merge from trunk revision 1483667 with little test modifications for proper merge.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 06:38:03 +00:00
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