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

6334 Commits

Author SHA1 Message Date
Jian He ce4d860308 Merge r1582913 from trunk. YARN-1017. Added documentation for ResourceManager Restart.(jianhe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582917 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 23:41:44 +00:00
Vinod Kumar Vavilapalli 8753d10405 MAPREDUCE-5810. Removed the faulty and failing streaming test TestStreamingTaskLog. Contributed by Akira Ajisaka. 
svn merge --ignore-ancestry -c 1582896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582897 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 22:17:44 +00:00
Vinod Kumar Vavilapalli 0ed1651028 YARN-1891. Added documentation for NodeManager health-monitoring. Contributed by Varun Vasudev. 
svn merge --ignore-ancestry -c 1582891 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582893 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 21:54:52 +00:00
Jing Zhao 0da50f6074 HADOOP-10301. Merge r1582883 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582884 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 21:22:39 +00:00
Chris Nauroth d8c11dc781 HADOOP-10450. Merging change r1582868 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582871 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 19:53:16 +00:00
Jonathan Turner Eagles a467e88ae4 YARN-1883. TestRMAdminService fails due to inconsistent entries in UserGroups (Mit Desai via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582865 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 19:45:05 +00:00
Tsz-wo Sze a6c405b99f svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor and the deprecated methods reportChecksumFailure, getDelegationToken(Text), renewDelegationToken and cancelDelegationToken from DistributedFileSystem. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582857 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 18:36:20 +00:00
Tsz-wo Sze 144ab4b15b svn merge -c 1582851 from trunk for HADOOP-10449. Fix the javac warnings in the security package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582852 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 18:16:28 +00:00
Haohui Mai ea1b523902 HDFS-6156. Merge r1582847 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582849 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 18:11:57 +00:00
Haohui Mai b7d68ff957 HDFS-6164. Merge r1582533 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582534 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 23:12:39 +00:00
Jonathan Turner Eagles edd6aa54cb HADOOP-10442. Group look-up can cause segmentation fault when certain JNI-based mapping module is used. (Kihwal Lee via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582452 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 20:08:47 +00:00
Haohui Mai 67fd877105 HDFS-5978. Merge r1582433 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582434 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 18:17:21 +00:00
Jing Zhao 47ecc90e56 HDFS-6163. Merge change r1582421 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582422 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 17:38:09 +00:00
Suresh Srinivas 88dc6c1ed3 HDFS-6162. Merge r1582181 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582182 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 04:27:50 +00:00
Haohui Mai b78ad887ed HDFS-6158. Merge r1582164 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582165 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 03:00:01 +00:00
Vinod Kumar Vavilapalli 039162818b MAPREDUCE-5805. Fixed MapReduce JobHistory encoding of queue-name to escape hyphens and thus avoid parsing errors. Contributed by Akira Ajisaka. 
svn merge --ignore-ancestry -c 1582125 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582127 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 23:44:17 +00:00
Haohui Mai a8c81bb8b6 HDFS-6157. Merge r1582098 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582100 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 22:36:11 +00:00
Suresh Srinivas bf266aa554 Merge r1582073 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582074 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 21:34:10 +00:00
Suresh Srinivas 53bebe2329 Merge r1582068 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582069 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 21:29:57 +00:00
Zhijie Shen 40c110c530 YARN-1873. Fixed TestDistributedShell failure when the test cases are out of order. Contributed by Mit Desai. 
svn merge --ignore-ancestry -c 1582060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582062 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 21:20:23 +00:00
Jing Zhao 8dc3ad11a9 HADOOP-10441. Merge r1582043 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582044 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 20:34:28 +00:00
Tsz-wo Sze 8ae6d5b5bd svn merge -c 1582015 from trunk for HADOOP-10437. Fix the javac warnings in the conf and the util package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582017 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 19:05:51 +00:00
Jing Zhao c87fbeb7a8 HDFS-5672. Merge r1581994 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581996 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 18:38:14 +00:00
Tsz-wo Sze 3e9e036099 svn merge -c 1581964 from trunk for HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581965 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 17:48:52 +00:00
Tsz-wo Sze e034eb46d8 svn merge -c 1581936 from trunk for HDFS-6115. Call flush() for every append on block scan verification log. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581937 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 17:03:57 +00:00
Suresh Srinivas 847ef81ec6 Merge r1581914 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581915 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 16:34:46 +00:00
Haohui Mai ba2506ae69 HDFS-6130. Merge r1581713 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581723 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 08:00:14 +00:00
Haohui Mai 496c14ccf0 HADOOP-10439. Fix compilation error in branch-2 after HADOOP-10426. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581721 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 07:58:47 +00:00
Arpit Agarwal 38d0fb9238 HDFS-5910: Merging r1581688 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581690 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 04:14:27 +00:00
Jian He 859f27040d Merge r1581678 from trunk. YARN-1521. Mark Idempotent/AtMostOnce annotations to the APIs in ApplicationClientProtcol, ResourceManagerAdministrationProtocol and ResourceTrackerProtocol so that they work in HA scenario. Contributed by Xuan Gong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581679 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 03:48:46 +00:00
Vinod Kumar Vavilapalli 7bd77e23d7 YARN-1867. Fixed a bug in ResourceManager that was causing invalid ACL checks in the web-services after fail-over. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1581662 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581664 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 03:04:02 +00:00
Vinod Kumar Vavilapalli 4c91a402f5 YARN-1452. Added documentation about the configuration and usage of generic application history and the timeline data service. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1581656 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581657 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 02:54:00 +00:00
Arpit Agarwal 8f708aa9fb HADOOP-10280: Merging r1581532,1581533 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581546 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 21:51:32 +00:00
Vinod Kumar Vavilapalli dd8a9bbadf YARN-1866. Fixed an issue with renewal of RM-delegation tokens on restart or fail-over. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1581448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581450 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 18:22:59 +00:00
Tsz-wo Sze 2cc8d2d65b svn merge -c 1581437 from trunk for HADOOP-10426. Declare CreateOpts.getOpt(..) with generic type argument, removes unused FileContext.getFileStatus(..) and fixes various javac warnings. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581440 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 18:09:48 +00:00
Haohui Mai d3b471155b HDFS-5196. Merge r1581427 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581429 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 17:55:48 +00:00
Jing Zhao 8b39fc9076 HDFS-5840. Merge r1581260 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581261 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 06:50:14 +00:00
Suresh Srinivas 590df94253 HDFS-6125. Merge 1581242 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581243 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 05:56:53 +00:00
Vinod Kumar Vavilapalli 45d6277ec2 YARN-1850. Introduced the ability to optionally disable sending out timeline-events in the TimelineClient. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1581189 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581190 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 02:23:08 +00:00
Tsz-wo Sze 70a254314a svn merge -c 1581183 from trunk for HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581186 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 02:05:03 +00:00
Vinod Kumar Vavilapalli e51fbb6a9e MAPREDUCE-5795. Fixed MRAppMaster to record the correct job-state after it recovers from a commit during a previous attempt. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1581180 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581181 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 02:01:13 +00:00
Arpit Agarwal 5303f4a66d HDFS-6124. Merging r1581124 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581137 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 23:45:55 +00:00
Chris Nauroth 501c09c2c4 HADOOP-10422. Merging change r1581112 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581123 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 23:31:52 +00:00
Karthik Kambatla 64e93189f1 HADOOP-10423. Clarify compatibility policy document for combination of new client and old server. (Chris Nauroth via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581117 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 23:27:12 +00:00
Chris Nauroth 02b4b702d3 HDFS-5846. Merging change r1581091 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581092 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 22:22:33 +00:00
Jing Zhao 069e6b389e HDFS-6135. Merge r1581070 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581071 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 21:26:24 +00:00
Jing Zhao b964c4424f Backport HDFS-5138 from trunk: Support HDFS upgrade in HA. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581067 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 21:08:50 +00:00
Brandon Li da2d86bd04 HDFS-6050. Merging change r1581055 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581059 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 20:57:51 +00:00
Jian He cb9fcd7f03 Merge r1580997 from trunk. YARN-1852. Fixed RMAppAttempt to not resend AttemptFailed/AttemptKilled events to already recovered Failed/Killed RMApps. Contributed by Rohith Sharmaks 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581001 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 19:06:50 +00:00
Tsz-wo Sze 95f1b6f5d5 Add target, .classpath, .project and .settings to svn:ignore. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581000 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 19:06:28 +00:00