Commit Graph

2887 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 60ad1056af MAPREDUCE-3940. ContainerTokens should have an expiry interval. Contributed by Siddharth Seth and Vinod Kumar Vavilapalli.
svn merge -c 1359910 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359912 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:33:04 +00:00
Harsh J 6df36b322b Backport of HDFS-3629 from trunk. svn merge -c 1359905 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359906 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:15:21 +00:00
Thomas Graves 6d100d340c merge -r 1359890:1359891 from trunk. FIXES: HADOOP-8573
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359892 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 20:51:19 +00:00
Harsh J 504353c259 Backport of HADOOP-8423 from trunk. svn merge -c 1359866 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359869 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 19:59:44 +00:00
Aaron Myers 1ed7052a82 HDFS-3568. fuse_dfs: add support for security. Contributed by Colin McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359826 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 18:31:25 +00:00
Robert Joseph Evans 2e4ec5ae32 svn merge -r 1359774:1359777 FIXES: HADOOP-8525. Provide Improved Traceability for Configuration (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359781 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:55:15 +00:00
Robert Joseph Evans aaea868826 svn merge -c 1359747. FIXES: MAPREDUCE-4252. MR2 job never completes with 1 pending task (Tom White via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359749 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:11:23 +00:00
Harsh J 1bdd4f4d38 Backport of HDFS-3555 from trunk. svn merge -c 1359619 ../../trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359621 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 11:53:39 +00:00
Thomas Graves 5ecf46efb6 merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 21:10:09 +00:00
Alejandro Abdelnur 3097c15d9d Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 19:19:42 +00:00
Aaron Myers d07d0f1a51 HDFS-3067. NPE in DFSInputStream.readBuffer if read is repeated on corrupted block. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359330 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 18:32:38 +00:00
Alejandro Abdelnur 681857a257 Merge -r 1359302:1359303 from trunk to branch. FIXES: MAPREDUCE-2739
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359304 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 17:41:05 +00:00
Robert Joseph Evans 2353571c64 svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359253 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 16:15:12 +00:00
Daryn Sharp 7212c3d638 svn merge -c 1296016 FIXES: HDFS-3037. TestMulitipleNNDataBlockScanner#testBlockScannerAfterRestart is racy. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359242 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 16:07:10 +00:00
Harsh J 9ffc3e7dfd Backport MAPREDUCE-3906 from trunk. svn merge -c 1358896 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358897 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:14:11 +00:00
Harsh J 41553468b1 Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:02:53 +00:00
Eli Collins 0628876901 HDFS-2391. Newly set BalancerBandwidth value is not displayed anywhere. Contributed by Harsh J
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358850 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 22:06:25 +00:00
Eli Collins b4c8c50456 HDFS-3548. NamenodeFsck.copyBlock fails to create a Block Reader. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358824 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 19:42:30 +00:00
Eli Collins 9f79f45b8c HDFS-711. hdfsUtime does not handle atime = 0 or mtime = 0 correctly. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358811 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 18:29:17 +00:00
Eli Collins 7dcf9b6b8f Fixup CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358807 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 18:20:22 +00:00
Eli Collins ac8b210736 HDFS-3603. Decouple TestHDFSTrash from TestTrash. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358806 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 18:19:43 +00:00
Uma Maheswara Rao G 2f7ad820e8 Merge from trunk r:1358794 HDFS-3541. Deadlock between recovery, xceiver and packet responder. Contributed by Vinay.
Submitted by:Vivay	
Reviewed by:	Uma Maheswara Rao G, Kihwal Lee, Aaron


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358798 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 17:56:41 +00:00
Harsh J b035a14d58 Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 17:24:38 +00:00
Harsh J 215c8add4e Backport of HDFS-2988 from trunk. svn merge -c 1358683 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358685 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 00:40:02 +00:00
Eli Collins 31c7f73f7b HDFS-3604. Add dfs.webhdfs.enabled to hdfs-default.xml. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358660 13f79535-47bb-0310-9956-ffa450edef68
2012-07-07 22:35:39 +00:00
Alejandro Abdelnur 5fed0da5b2 Merge -r 1358453:1358454 from trunk to branch. FIXES: HADOOP-8566
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358455 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 22:29:51 +00:00
Aaron Myers fbb1760459 Fix issue with NN/DN re-registration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358348 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 19:00:06 +00:00
Robert Joseph Evans 2e6f49f4e4 svn merge -c 1358305 FIXES: MAPREDUCE-4379. Node Manager throws java.lang.OutOfMemoryError: Java heap space due to org.apache.hadoop.fs.LocalDirAllocator.contexts (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358308 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 17:20:45 +00:00
Thomas Graves ca23ea7cf5 merge -r 1358200:1358201 from trunk. FIXES: MAPREDUCE-4387
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358203 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 13:39:41 +00:00
Todd Lipcon 5f6a138ca0 HDFS-3170. Add more useful metrics for write latency. Contributed by Matthew Jacobs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357969 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 22:18:16 +00:00
Thomas Graves ca78b62579 merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 21:37:53 +00:00
Thomas Graves 9e4b5f52ea merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357813 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 19:14:13 +00:00
Robert Joseph Evans 93f425a659 svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 18:10:51 +00:00
Alejandro Abdelnur c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 16:33:34 +00:00
Eli Collins d222e91bfa HDFS-3581. FSPermissionChecker#checkPermission sticky bit check missing range check. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356972 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 21:43:48 +00:00
Eli Collins 0929846101 HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356948 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 21:13:02 +00:00
Todd Lipcon aec6b65fcb HDFS-3574. Fix small race and do some cleanup in GetImageServlet. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356937 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:55:10 +00:00
Todd Lipcon e60abcb8ab HDFS-3343. Improve metrics for DN read latency. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356930 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:46:42 +00:00
Daryn Sharp 3131e49840 HADOOP-8110. Fix trash checkpoint collisions (Jason Lowe via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356918 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:28:30 +00:00
Suresh Srinivas 84c073b341 HADOOP-8533. Merging change r1356504 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356515 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 23:03:17 +00:00
Eli Collins 2d05f1a749 HADOOP-8463. hadoop.security.auth_to_local needs a key definition and doc. Contributed by Madhukara Phatak
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356514 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 22:48:05 +00:00
Alejandro Abdelnur 1142e13bd4 Merge -r 1356329:1356330 from trunk to branch. FIXES: HDFS-3575
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356332 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 16:42:28 +00:00
Tsz-wo Sze 2de013e0a8 svn merge -c 1356086 from trunk for HDFS-3157. Fix a bug in the case that the generation stamps of the stored block in a namenode and the reported block from a datanode do not match.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356095 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:39:02 +00:00
Eli Collins 2b938bea99 HADOOP-8538. CMake builds fail on ARM. Contributed by Trevor Robinson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356042 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 22:51:13 +00:00
Harsh J d8409ef981 Backport of HADOOP-3450. svn merge -c 1355789 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355791 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 18:53:00 +00:00
Harsh J 1ddedb6345 Backport of HADOOP-6802. svn merge -c 1355784 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355788 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 18:44:31 +00:00
Harsh J f62de1d81e svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 17:11:46 +00:00
Harsh J 6f299e4e25 HADOOP-8449. hadoop fs -text fails with compressed sequence files with the codec file extension (backported from trunk) (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355637 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 05:05:41 +00:00
Alejandro Abdelnur b51d32719d Merge -r 1355592:1355593 from trunk to branch. FIXES: HDFS-3580
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355595 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 22:59:09 +00:00
Todd Lipcon 535fd7de15 HDFS-3446. HostsFileReader silently ignores bad includes/excludes. Contributed by Matthew Jacobs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355583 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 22:23:53 +00:00