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

3736 Commits

Author SHA1 Message Date
Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 16:22:55 +00:00
Vinod Kumar Vavilapalli 76939f2877 MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen. 
svn merge --ignore-ancestry -c 1430707 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 06:33:01 +00:00
Arun Murthy 122cd0fb5b Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 05:31:53 +00:00
Arun Murthy b412841745 Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 05:17:31 +00:00
Eli Collins 1c08bb25a0 HDFS-4035. LightWeightGSet and LightWeightHashSet increment a volatile without synchronization. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430619 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 22:57:39 +00:00
Suresh Srinivas 80a59a5fb1 HDFS-4362. Merging change r1430137 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430594 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 22:43:28 +00:00
Eli Collins de8ec340ca HDFS-4034. Remove redundant null checks. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430588 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 22:39:40 +00:00
Eli Collins 030fc9a0c3 HDFS-4033. Miscellaneous findbugs 2 fixes. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430576 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 22:24:56 +00:00
Eli Collins 38135e3651 HDFS-4031. Update findbugsExcludeFile.xml to include findbugs 2 exclusions. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430552 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 21:43:12 +00:00
Eli Collins 99a64115ce HDFS-4030. BlockManager excessBlocksCount and postponedMisreplicatedBlocksCount should be AtomicLongs. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430549 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 21:37:46 +00:00
Eli Collins ecf8c442f4 HDFS-4100. Fix all findbug security warings. Contributed by Liang Xie 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430545 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 21:13:48 +00:00
Thomas Graves 8c9b47c29e MAPREDUCE-4899 fix branch-2 merge issue in pom 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430470 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 19:53:32 +00:00
Suresh Srinivas fcf58ade60 HADOOP-9119. Merge 1430387 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430389 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 17:02:12 +00:00
Thomas White 75878f6c7b Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 16:31:58 +00:00
Vinod Kumar Vavilapalli e4a933b550 YARN-253. Fixed container-launch to not fail when there are no local resources to localize. Contributed by Tom White. 
svn merge --ignore-ancestry -c 1430269 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430270 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 13:23:04 +00:00
Aaron Myers 4e9f524ee3 HDFS-3970. Fix bug causing rollback of HDFS upgrade to result in bad VERSION file. Contributed by Vinay and Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430038 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 21:50:28 +00:00
Suresh Srinivas 314e79bc2d HADOOP-9181. Merge 1429810 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429813 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 14:37:45 +00:00
Vinod Kumar Vavilapalli 6a52f90017 YARN-170. Change NodeManager stop to be reentrant. Contributed by Sandy Ryza. 
svn merge --ignore-ancestry -c 1429796 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429797 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 13:45:31 +00:00
Vinod Kumar Vavilapalli 9a87b2f7fe MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas. 
svn merge --ignore-ancestry -c 1429751 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 11:15:10 +00:00
Vinod Kumar Vavilapalli c166490bf0 YARN-315. Using the common security token protobuf definition from hadoop common. Contributed by Suresh Srinivas. 
svn merge --ignore-ancestry -c 1429748 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429749 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 11:10:04 +00:00
Vinod Kumar Vavilapalli 29a34c16a6 YARN-217. Fix RMAdmin protocol description to make it work in secure mode also. Contributed by Devaraj K. 
svn merge --ignore-ancestry -c 1429683 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429684 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 06:37:30 +00:00
Tsz-wo Sze abf7e8dcc0 svn merge -c 1429653 from trunk for HDFS-4351. In BlockPlacementPolicyDefault.chooseTarget(..), numOfReplicas needs to be updated when avoiding stale nodes. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429654 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 03:12:15 +00:00
Thomas Graves b035a444e1 MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-05 20:19:18 +00:00
Robert Joseph Evans 199df2b770 svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:38:36 +00:00
Thomas Graves 2cb090a075 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:31:22 +00:00
Thomas Graves 5596a8cb11 YARN-50. Implement renewal / cancellation of Delegation Tokens(Siddharth Seth via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429104 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:31:12 +00:00
Jason Darrell Lowe ec4fc07c52 svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 19:27:56 +00:00
Suresh Srinivas b1fe072e04 HADOOP-9173. Merging changes r1428970 and r1428972 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429030 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 18:54:12 +00:00
Thomas White c77f41224d Merge -r 1428780:1428781 from trunk to branch-2. Fixes: YARN-286. Add a YARN ApplicationClassLoader. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428782 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 11:02:51 +00:00
Tsz-wo Sze 3e68d15c1e svn merge -c 1428739 from trunk for HDFS-4270. Introduce soft and hard limits for max replication so that replications of the highest priority are allowed to choose a source datanode that has reached its soft limit but not the hard limit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428743 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 08:13:52 +00:00
Todd Lipcon b4b26fc0a1 HDFS-4302. Fix fatal exception when starting NameNode with DEBUG logs. Contributed by Eugene Koontz. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428591 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 20:55:09 +00:00
Siddharth Seth bcd93d2fda merge YARN-103 from trunk. Add a yarn AM-RM client module. Contributed by Bikas Saha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428555 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 19:12:30 +00:00
Robert Joseph Evans 6862511182 svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 17:21:27 +00:00
Thomas White ece31146cf Merge -r 1428399:1428400 from trunk to branch-2. Fixes: YARN-301. Fair scheduler throws ConcurrentModificationException when iterating over app's priorities. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428401 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 15:29:17 +00:00
Thomas White 7fcf0ec2aa Merge -r 1428386:1428387 from trunk to branch-2. Fixes: YARN-300. After YARN-271, fair scheduler can infinite loop and not schedule any application. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428393 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 15:10:14 +00:00
Thomas White cd468dc7da Merge -r 1428361:1428362 from trunk to branch-2. Fixes: YARN-288. Fair scheduler queue doesn't accept any jobs when ACLs are configured. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428383 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 15:02:51 +00:00
Thomas White 1a7512987d Merge -r 1428313:1428314 from trunk to branch-2. Fixes: YARN-192. Node update causes NPE in the fair scheduler. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428316 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 12:30:20 +00:00
Jason Darrell Lowe b59f4e5e60 svn merge -c 1428095 FIXES: YARN-293. Node Manager leaks LocalizerRunner object for every Container. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428097 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-02 22:46:35 +00:00
Konstantin Shvachko 485b5b4058 HDFS-4349. Add test for reading files from BackupNode. Contributed by Konstantin Shvachko. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1427291 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-01 03:40:27 +00:00
Konstantin Shvachko a3e393afaf HDFS-4347. Avoid infinite waiting checkpoint to complete in TestBackupNode. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426706 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-29 04:28:38 +00:00
Konstantin Shvachko 6a4b1b881c HDFS-4308. addBlock() should persist file blocks once. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426703 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-29 04:18:00 +00:00
Robert Joseph Evans 52742c9a65 svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-28 15:06:15 +00:00
Robert Joseph Evans 4b5a93bc1d svn merge -c 1426515 FIXES: YARN-225. Proxy Link in RM UI thows NPE in Secure mode (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426516 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-28 14:22:23 +00:00
Jason Darrell Lowe 7bec80179b svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-26 20:49:39 +00:00
Arun Murthy 6796f8d226 Merge -c 1425560 from trunk to branch-2 to fix HDFS-4326. bump up Tomcat version for HttpFS to 6.0.36. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425562 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-24 00:16:23 +00:00
Alejandro Abdelnur 7194c52ec3 HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425527 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-23 21:15:42 +00:00
Arun Murthy f68da35bb2 Reverting HDFS-4326 since it caused 'mvn package' to break. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425400 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-23 03:52:42 +00:00
Suresh Srinivas 15fe833da7 HADOOP-9162. Merge change 1425390 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425392 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-23 02:15:17 +00:00
Vinod Kumar Vavilapalli 67b3e5d8cc Fixing CHANGES.txt for YARN-285. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425230 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-22 01:57:49 +00:00
Vinod Kumar Vavilapalli 121a79c7a1 MAPREDUCE-4899. Implemented a MR specific plugin for tracking finished applications that YARN's ResourceManager doesn't keep track off anymore. Contributed by Derek Dagit. 
svn merge --ignore-ancestry -c 1425225 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425226 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-22 01:49:02 +00:00