Commit Graph

2699 Commits

Author SHA1 Message Date
Alejandro Abdelnur 497de4942a Merge -r 1350007:1350008 from trunk to branch. FIXES: HADOOP-8509
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350012 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 20:50:16 +00:00
Eli Collins 401f9ace50 HDFS-3480. Multiple SLF4J binding warning. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349644 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:53:48 +00:00
Eli Collins 17b4ce909c HADOOP-8433. Don't set HADOOP_LOG_DIR in hadoop-env.sh. Contributed by Brahma Reddy Battula
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349642 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:37:49 +00:00
Aaron Myers cbd17834c0 HDFS-766. Error message not clear for set space quota out of boundary values. Contributed by Jon Zuanich.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349640 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:34:19 +00:00
Eli Collins 788592aa3b HDFS-3372. offlineEditsViewer should be able to read a binary edits file with recovery mode. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349630 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 03:38:14 +00:00
Eli Collins bc5f311bb8 HDFS-3531. EditLogFileOutputStream#preallocate should check for incomplete writes. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349617 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:48:26 +00:00
Alejandro Abdelnur 5c15ffdc3e Merge -r 1349612:1349613 from trunk to branch. FIXES: HADOOP-8465
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349615 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:26:20 +00:00
Eli Collins 5b4080c094 Fix bug in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349566 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:13:58 +00:00
Eli Collins e1da4f4541 HADOOP-8507. Avoid OOM while deserializing DelegationTokenIdentifer. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349564 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:12:53 +00:00
Alejandro Abdelnur 12201fca35 Merge -r 1349554:1349555 from trunk to branch. FIXES: HDFS-3428
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:03:52 +00:00
Alejandro Abdelnur 16ae946de4 Merge -r 1349513:1349514 from trunk to branch. FIXES: HADOOP-8458
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349516 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 20:48:29 +00:00
Uma Maheswara Rao G 1bfab40533 Updated CHANGES.txt for Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349470 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:28:38 +00:00
Uma Maheswara Rao G 0b32101511 Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349469 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:27:01 +00:00
Uma Maheswara Rao G 148f7e2dd7 Merge r:1349456 and r:1349459 HDFS-3408. BKJM : Namenode format fails, if there is no BK root. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349462 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:04:31 +00:00
Eli Collins 2acc997daa Revert HADOOP-8491
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349135 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 06:23:43 +00:00
Tsz-wo Sze 4c831ec671 svn merge -c 1349124 from trunk for HDFS-3504.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 05:33:54 +00:00
Eli Collins 8e1730243b HDFS-3520. Add transfer rate logging to TransferFsImage. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349118 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 05:01:50 +00:00
Tsz-wo Sze abfd7dba32 svn merge -c 1349088 from trunk for HDFS-3522. If a namenode is in safemode, it should throw SafeModeException when getBlockLocations has zero locations.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349090 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 01:59:24 +00:00
Tsz-wo Sze 97ab65f3ab svn merge -c 1348998 from trunk for HDFS-3052. Change INodeFile and INodeFileUnderConstruction to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349089 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 01:57:38 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
Eli Collins 9d83af831b HADOOP-8491. Check for short writes when using FileChannel#write and related methods. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349025 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 21:26:06 +00:00
Eli Collins bc18206bbe HDFS-3517. TestStartup should bind ephemeral ports. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349005 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:53:08 +00:00
Thomas White f323ea705d Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Alejandro Abdelnur cca04f2bf6 HADOOP-8368. Amendment to add entry in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348961 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:47:53 +00:00
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Eli Collins d781e8efdf HDFS-2797. Fix misuses of InputStream#skip in the edit log code. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348953 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:20:41 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Tsz-wo Sze 1f564d1135 svn merge -c 1348287 from trunk for HDFS-3490. DatanodeWebHdfsMethods throws NullPointerException if NamenodeRpcAddressParam is not set.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348288 13f79535-47bb-0310-9956-ffa450edef68
2012-06-09 00:55:47 +00:00
Todd Lipcon 4b531693d3 HDFS-3243. TestParallelRead timing out on jenkins. Contributed by Henry Robinson.
(svn merge -c 1312029 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348257 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:45:54 +00:00
Todd Lipcon caa6f4ab98 HDFS-3514. Add missing TestParallelLocalRead. Contributed by Henry Robinson.
(svn merge -c 1348207 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348249 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:23:35 +00:00
Todd Lipcon 5b43977af1 HDFS-3235. MiniDFSClusterManager doesn't correctly support -format option. Contributed by Henry Robinson.
(svn merge -c 1311556 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348247 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:19:17 +00:00
Todd Lipcon e6c0425996 HDFS-3110. Use directRead API to reduce the number of buffer copies in libhdfs. Contributed by Henry Robinson.
(svn merge -c 1310185 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348246 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 21:16:34 +00:00
Todd Lipcon 2ce56df137 HDFS-2834. Add a ByteBuffer-based read API to DFSInputStream. Contributed by Henry Robinson.
(svn merge -c 1303474 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348217 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 20:01:32 +00:00
Todd Lipcon 7b743ac87f HADOOP-8244. Improve comments on ByteBufferReadable.read. Contributed by Henry Robinson.
(svn merge -c 1309625 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348209 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 19:54:42 +00:00
Todd Lipcon e3721d582c HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. Contributed by Henry Robinson.
(svn merge -c 1296556 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348208 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 19:52:59 +00:00
Thomas Graves d1607ba557 merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
Aaron Myers 4757836b75 HDFS-2914. HA: Standby should not enter safemode when resources are low. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347898 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 07:04:58 +00:00
Eli Collins fb52b5ec9e HADOOP-8488. test-patch.sh gives +1 even if the native build fails. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347847 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 00:45:59 +00:00
Todd Lipcon 913ba74512 Move HDFS-3042 changes into main CHANGES.txt files for branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347805 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:30:54 +00:00
Todd Lipcon d7e171d5b8 Merge HDFS-3042 (automatic failover) to branch-2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:25:34 +00:00
Todd Lipcon 4db45a7f7a Revert HDFS-3492 from r1347192: patch broke TestShortCircuitLocalRead
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347797 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:06:41 +00:00
Todd Lipcon 35b44b5387 HDFS-3485. DataTransferThrottler will over-throttle when currentTimeMillis jumps. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347753 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 18:43:45 +00:00
Tsz-wo Sze 1156fc41dc svn merge -c -1347094 for reverting HADOOP-8368 again.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347739 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 17:58:19 +00:00
Todd Lipcon 56de3ad39d HDFS-3492. Fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347191 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 22:48:40 +00:00
Eli Collins 3f1179c966 HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347134 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 21:14:55 +00:00
Eli Collins f159bd401a HDFS-3505. DirectoryScanner does not join all threads in shutdown. Contributed Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347122 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 21:01:59 +00:00
Alejandro Abdelnur bad1c8bdd5 svn merge -c -1346495 for re-committing HADOOP-8368. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 20:17:33 +00:00
Vinod Kumar Vavilapalli cb4b43b37e MAPREDUCE-3873. Fixed NodeManagers' decommissioning at RM to accept IP addresses also. Contributed by xieguiming and vinodkv.
svn merge --ignore-ancestry -c 1346671 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346673 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 23:55:46 +00:00
Tsz-wo Sze b93758626e svn revert -c -1346102 for reverting HADOOP-8368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346495 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 18:00:44 +00:00
Robert Joseph Evans eb7df250ca svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due TokenCache.getDelegationToken compilation error (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 15:09:56 +00:00