Commit Graph

3770 Commits

Author SHA1 Message Date
Suresh Srinivas ead0693d68 YARN-328. Merge r1433231 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433233 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:22:56 +00:00
Suresh Srinivas 1b410df23f MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:13:43 +00:00
Suresh Srinivas d7079f1429 HADOOP-9203. Merge 1433220 to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433225 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:58:11 +00:00
Suresh Srinivas 26de042a09 Reverting the commit r1433222 to fix the commit message
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433223 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:55:38 +00:00
Suresh Srinivas 68cf069f20 HADOOP-9093. Merge 1433220 to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433222 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:52:57 +00:00
Suresh Srinivas eae2575378 HDFS-4369. Merging change 1433206 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433211 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:18:54 +00:00
Suresh Srinivas 303cf8fa39 HDFS-4364. GetLinkTargetResponseProto does not handle null path. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433202 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 23:10:54 +00:00
Hitesh Shah f2c7de8f4e Merge -c 1433138 from trunk to branch-2 to fix YARN-330. Fix flakey test: TestNodeManagerShutdown#testKillContainersOnShutdown. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433147 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 21:36:32 +00:00
Todd Lipcon 034ec8af5a HDFS-3429. DataNode reads checksums even if client does not need them. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433116 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 20:44:29 +00:00
Thomas Graves 2fa1932e9d HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432942 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:02:21 +00:00
Thomas Graves 0b366be496 HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432941 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:59 +00:00
Thomas Graves fdc4c61101 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:35 +00:00
Thomas Graves dc426254d3 YARN-334. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432939 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:01 +00:00
Konstantin Shvachko 67d123c6b7 HDFS-1245. Pluggable block id generation. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432541 13f79535-47bb-0310-9956-ffa450edef68
2013-01-13 01:29:57 +00:00
Eli Collins f07582bc84 HDFS-4274. BlockPoolSliceScanner does not close verification log during shutdown. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432318 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 22:21:21 +00:00
Jason Darrell Lowe 596007fdc4 svn merge -c 1429872 to add svn:ignore properties to hadoop-mapreduce-client-hs-plugins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432240 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 19:22:18 +00:00
Robert Joseph Evans 63106e20e0 svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 19:05:02 +00:00
Eli Collins 0dadaa47c3 HDFS-4328. TestLargeBlock#testLargeBlockSize is timing out. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432226 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 18:56:02 +00:00
Eli Collins 2f33ec0298 HDFS-4387. test_libhdfs_threaded SEGV on OpenJDK 7. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432223 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 18:50:21 +00:00
Suresh Srinivas 04179b7158 HADOOP-9192. Merge 1432158 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432163 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 17:13:35 +00:00
Suresh Srinivas bc000eea02 HDFS-4381. Merge 1432149 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432153 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 17:03:09 +00:00
Thomas Graves 32d84f899f HDFS-2908. Add apache license header for StorageReport.java. (Brandon Li via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431837 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 02:53:42 +00:00
Eli Collins 71163ca1ed HDFS-4377. Some trivial DN comment cleanup. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431754 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 00:11:06 +00:00
Alejandro Abdelnur 4774c6a5b8 MAPREDUCE-4907. Ammendment, forgot to svn add testcase in original commit
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431511 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 17:28:27 +00:00
Suresh Srinivas 4c3b67d0c9 HDFS-4367. Merge change 1429199 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431462 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 16:10:58 +00:00
Thomas White a22278f23f Merge -r 1431250:1431251 from trunk to branch-2. Fixes: HADOOP-9183. Potential deadlock in ActiveStandbyElector.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431252 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 10:09:06 +00:00
Eli Collins b8b1a264ac HDFS-4032. Specify the charset explicitly rather than rely on the default. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431180 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 02:34:45 +00:00
Alejandro Abdelnur 572f7f45d6 MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 00:52:15 +00:00
Aaron Myers 913d2424a0 HADOOP-9155. FsPermission should have different default value, 777 for directory and 666 for file. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431157 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 23:54:24 +00:00
Jason Darrell Lowe fb0a8ff926 svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 23:01:11 +00:00
Aaron Myers 5da072bd59 HDFS-4306. PBHelper.convertLocatedBlock miss convert BlockToken. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431118 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 22:31:44 +00:00
Suresh Srinivas fa72c8f6eb HDFS-4363. Merge change r1431088 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431101 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 21:37:01 +00:00
Thomas Graves 9b571e9ebc YARN-325. RM CapacityScheduler can deadlock when getQueueInfo() is called and a container is completing (Arun C Murthy via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431076 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 21:04:39 +00:00
Siddharth Seth 6821a98c70 merge YARN-320 from trunk. RM should always be able to renew its own tokens. Contributed by Daryn Sharp
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431023 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 19:34:01 +00:00
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