big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,508 Commits 2 Branches 2 Tags 264 MiB
9180eca592
Commit Graph

418 Commits

Author SHA1 Message Date
Eli Collins
7b913180be HDFS-2808. HA: haadmin should use namenode ids. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240600 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 20:12:51 +00:00
Aaron Myers
ec6961b39c HDFS-2792. Make fsck work. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240449 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 03:10:39 +00:00
Robert Joseph Evans
cf897b6f3c HADOOP-8013 ViewFileSystem does not honor setVerifyChecksum (Missed a file) (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240385 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 23:02:34 +00:00
Robert Joseph Evans
da00476fca HADOOP-8013 ViewFileSystem does not honor setVerifyChecksum (Dayrn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240383 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 22:55:52 +00:00
Robert Joseph Evans
fdc47f7833 HADOOP-8018 Hudson auto test for HDFS has started throwing javadoc (Jon Eagles via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240232 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 16:24:30 +00:00
Robert Joseph Evans
7e8bf2c7ee HADOOP-8015 ChRootFileSystem should extend FilterFileSystem (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239924 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 23:24:04 +00:00
Eli Collins
4324e1bcd7 HADOOP-7991. HA: the FailoverController should check the standby is ready before failing over. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239774 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 19:20:32 +00:00
Eli Collins
1950f97ab9 HADOOP-8012. hadoop-daemon.sh and yarn-daemon.sh are trying to mkdir and chown log/pid dirs which can fail. Contributed by Roman Shaposhnik 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239752 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 18:45:07 +00:00
Robert Joseph Evans
58ba16e85f HADOOP-8001 ChecksumFileSystem's rename doesn't correctly handle checksum files (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239727 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 17:12:44 +00:00
Tsz-wo Sze
42d1c9b251 HADOOP-7470. Move up to Jackson 1.8.8. Contributed by Enis Soztutar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239386 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 22:55:59 +00:00
Mahadev Konar
947ede4c4e MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239310 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 20:43:10 +00:00
Alejandro Abdelnur
e5ab158846 HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for downstream projects. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239222 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 17:35:14 +00:00
Robert Joseph Evans
f8a245c273 HADOOP-8006 TestFSInputChecker is failing in trunk. (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238841 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 22:40:25 +00:00
Eli Collins
6884348444 HADOOP-7938. HA: the FailoverController should optionally fence the active during failover. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238058 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 22:42:46 +00:00
Eli Collins
5c156519df HADOOP-7983. HA: failover should be able to pass args to fencers. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238049 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 22:27:42 +00:00
Mahadev Konar
e6ca182a26 HADOOP-7999. "hadoop archive" fails with ClassNotFoundException. (Jason Lowe via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237915 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 18:33:11 +00:00
Aaron Myers
6122357da5 HDFS-2841. HAAdmin does not work if security is enabled. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237534 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 02:52:27 +00:00
Aaron Myers
30dd704e6c Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237157 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 20:33:30 +00:00
Mahadev Konar
934047630a HADOOP-8002. SecurityUtil acquired token message should be a debug rather than info. (Arpit Gupta via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236976 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 04:05:19 +00:00
Todd Lipcon
327c216c2f Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236965 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 02:50:23 +00:00
Jitendra Nath Pandey
ed6a73140e HADOOP-7988. Upper case in hostname part of the principals doesn't work with kerberos. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236960 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 02:24:08 +00:00
Aaron Myers
2b2e56056e Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236936 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 00:21:07 +00:00
Alejandro Abdelnur
8a234f394e HADOOP-7939. Improve Hadoop subcomponent integration in Hadoop 0.23. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236929 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 23:53:35 +00:00
Mahadev Konar
5d15e5640e HADOOP-8000. fetchdt command not available in bin/hadoop. (Arpit Gupta via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236921 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 23:15:57 +00:00
Robert Joseph Evans
cc8a2a29f1 HADOOP-7998 CheckFileSystem does not correctly honor setVerifyChecksum (Daryn Sharp via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236911 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 22:42:47 +00:00
Mahadev Konar
c8bb6f59b8 HADOOP-7993. Hadoop ignores old-style config options for enabling compressed output. (Anupam Seth via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236506 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 03:42:36 +00:00
Eli Collins
c5caed914d HADOOP-7997. SequenceFile.createWriter(...createParent...) no longer works on existing file. Contributed by Gregory Chanan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236456 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 00:09:10 +00:00
Jitendra Nath Pandey
12289efa2b HADOOP-7965. Support for protocol version and signature in PB. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236444 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 23:23:03 +00:00
Aaron Myers
1c95060a72 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236333 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 18:03:46 +00:00
Harsh J
563b09c004 merge HADOOP-4515 HADOOP-6490 HADOOP-7574 HADOOP-7736 HADOOP-7919 to 0.23 from trunk and update CHANGES.txt file accordingly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236125 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 10:06:46 +00:00
Jitendra Nath Pandey
a00640a3db HADOOP-7987. Support setting the run-as user in unsecure mode. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235945 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-25 21:02:47 +00:00
Suresh Srinivas
cbfe8fea0e HADOOP-7992. Add ZKClient library to facilitate leader election. Contributed by Bikas Saha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235841 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-25 17:26:20 +00:00
Jitendra Nath Pandey
0b2245a0f3 HDFS-2807. Service level authorizartion for HAServiceProtocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235431 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 19:31:49 +00:00
Aaron Myers
83bcb1bbf4 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235380 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 17:59:14 +00:00
Eli Collins
5dfe62d845 HDFS-2397. Undeprecate SecondaryNameNode. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235135 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 06:05:52 +00:00
Todd Lipcon
fa4a33a566 Merge trunk into HA branch. 
- Some conflicts on BlockManager due to the recent commit of HDFS-2822 - moved logic to processMisReplicatedBlock function
- testNoExtensionIfNoBlocks(org.apache.hadoop.hdfs.TestSafeMode) is now failing due to an existing bug in the HA branch, to be fixed soon 


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235078 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 00:00:05 +00:00
Mahadev Konar
f07d91a1fc HADOOP-7981. Improve documentation for org.apache.hadoop.io.compress.Decompressor.getRemaining (Jonathan Eagles via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235007 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 21:44:49 +00:00
Aaron Myers
e42bbfbca2 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234924 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 18:07:27 +00:00
Vinod Kumar Vavilapalli
959d1d0181 HADOOP-7986. Adding config for MapReduce History Server protocol in hadoop-policy.xml for service level authorization. Contributed by Mahadev Konar. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234097 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 19:49:05 +00:00
Aaron Myers
2abe5c818d Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234087 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 19:30:53 +00:00
Todd Lipcon
b7eb5334f5 HADOOP-7982. UserGroupInformation fails to login if thread's context classloader can't load HadoopLoginModule. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233751 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 03:33:50 +00:00
Aaron Myers
6177bf6c8f Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233105 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-18 23:02:17 +00:00
Arun Murthy
5ffff3aea9 HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for backward compatibility. Contributed by Prashath Sharma. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232322 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 06:56:52 +00:00
Todd Lipcon
212678f036 HDFS-2767. ConfiguredFailoverProxyProvider should support NameNodeProtocol. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232284 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 03:10:25 +00:00
Aaron Myers
940eeb866c Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232184 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-16 21:57:28 +00:00
Harsh J
a9002bfea1 HADOOP-7968. Errant println left in RPC.getHighestSupportedProtocol (Sho Shimauchi via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231732 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-15 19:15:04 +00:00
Eli Collins
aee1bb81c6 HADOOP-7974. TestViewFsTrash incorrectly determines the user's home directory. Contributed by Harsh J 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231640 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-15 08:51:48 +00:00
Harsh J
69290d383c HADOOP-7975. Add LZ4 as an entry in the default codec list, missed by HADOOP-7657 (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231627 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-15 05:18:59 +00:00
Eli Collins
1c24ae0cd8 HDFS-2789. TestHAAdmin.testFailover is failing. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1231577 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-14 20:19:55 +00:00
Suresh Srinivas
72207596be HADOOP-7972. HAServiceProtocol exceptions need to be unwrapped. Contributed by Hari Mankude. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230861 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-13 02:30:29 +00:00
Aaron Myers
8610a9231a Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230696 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-12 18:40:50 +00:00
Suresh Srinivas
09e5af76f3 HADOOP-7970. HAServiceProtocol methods must throw IOException.Contributed by Hari Mankude. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230351 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-12 01:39:30 +00:00
Suresh Srinivas
8f83a2355b HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230249 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 21:02:04 +00:00
Aaron Myers
ede7f21278 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230248 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 20:53:50 +00:00
Eli Collins
469f9e2db1 Update CHANGES.txt to reflect merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229468 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 05:11:54 +00:00
Todd Lipcon
44d070cd01 HDFS-2724. NN web UI can throw NPE after startup, before standby state is entered. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229466 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 03:46:05 +00:00
Vinod Kumar Vavilapalli
8feb26f116 HADOOP-7963. Fix ViewFS to catch a null canonical service-name and pass tests TestViewFileSystem* (Siddharth Seth via vinodkv) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229379 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 21:52:53 +00:00
Aaron Myers
ade897636d Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229279 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 18:01:55 +00:00
Harsh J
8819fda489 Merged HDFS-2349, HDFS-2729, HDFS-2726, HDFS-554, HDFS-1314, HADOOP-7910 to branch-0.23, updating CHANGES.txt for trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228567 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-07 03:44:48 +00:00
Eli Collins
89937fe7c7 Previous commit missed test packages. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228566 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-07 03:42:56 +00:00
Eli Collins
fcf1039cdc Previous commit didn't fixup package statements. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228561 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-07 03:29:35 +00:00
Eli Collins
2d0b340c47 HADOOP-7961. Move HA fencing to common. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228510 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-07 00:17:42 +00:00
Aaron Myers
d680080da0 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228339 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 18:47:05 +00:00
Thomas White
a878bea3fe HADOOP-7937. Forward port SequenceFile#syncFs and friends from Hadoop 1.x. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228291 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 17:24:55 +00:00
Alejandro Abdelnur
750c5d881c HADOOP-7936. There's a Hoop README in the root dir of the tarball. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227968 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 05:58:39 +00:00
Harsh J
574f0b4c0a HADOOP-4515. Configuration#getBoolean must not be case sensitive. (Sho Shimauchi via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227964 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 05:42:24 +00:00
Aaron Myers
20af88280a Fix bad merge which mixed up two configuration options. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227962 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 05:37:24 +00:00
Alejandro Abdelnur
b3bcbe274d HADOOP-7907. hadoop-tools JARs are not part of the distro. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227901 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 00:02:04 +00:00
Jitendra Nath Pandey
a230d19d99 HADOOP-7957. Classes deriving GetGroupsBase should be able to override proxy creation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227861 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:56:47 +00:00
Alejandro Abdelnur
5f5561d057 Fixing CHANGES.txt files, moving JIRAs from trunk to 0.23.1 section. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227859 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:55:43 +00:00
Eli Collins
fb9cdcfa60 HADOOP-7924. 
FailoverController for client-based configuration. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227836 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:02:59 +00:00
Alejandro Abdelnur
6d45b9e31d HADOOP-7934. Normalize dependencies versions across all modules. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227787 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 19:46:42 +00:00
Aaron Myers
3187a3ae05 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227775 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 19:21:01 +00:00
Suresh Srinivas
4bb572d336 HADOOP-7808. Port HADOOP-7510 - Add configurable option to use original hostname in token instead of IP to allow server IP change. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227737 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 18:41:59 +00:00
Eli Collins
85c4158074 HADOOP-7949. Updated maxIdleTime default in the code to match core-default.xml. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227423 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 01:31:14 +00:00
Aaron Myers
cd81cc6664 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227260 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 18:47:51 +00:00
Alejandro Abdelnur
1447274693 HADOOP-7948. Shell scripts created by hadoop-dist/pom.xml to build tar do not properly propagate failure. (cim_michajlomatijkiw via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227225 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 16:56:01 +00:00
Harsh J
075122690c HDFS-1314. Make dfs.blocksize accept size-indicating prefixes (Sho Shimauchi via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227165 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 14:15:15 +00:00
Siddharth Seth
7ee3e072b8 HADOOP-7933. Add a getDelegationTokens api to FileSystem which checks for known tokens in the passed Credentials object. (sseth) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226916 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-03 18:58:57 +00:00
Aaron Myers
1423fff096 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1226900 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-03 18:07:55 +00:00
Harsh J
5f15c292dc HADOOP-7504. Add the missing Ganglia31 opts to hadoop-metrics.properties as a comment. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226351 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-02 06:30:20 +00:00
Harsh J
36a2d57f07 HADOOP-7919. Remove the unused hadoop.logfile.* properties from the core-default.xml file. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226350 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-02 06:26:40 +00:00
Harsh J
11905517f1 HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226211 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-01 03:11:48 +00:00
Aaron Myers
f216303598 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225612 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-29 18:25:48 +00:00
Harsh J
07027b80f3 HADOOP-7910. Add Configuration.getLongBytes to handle human readable byte size values. (Sho Shimauchi via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225489 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-29 10:27:14 +00:00
Aaron Myers
d619dee4ed Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225264 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-28 18:37:22 +00:00
Harsh J
1e0c51c66e HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225192 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-28 14:30:19 +00:00
Harsh J
9eb87574a3 HADOOP-7574. Improve FSShell -stat, add user/group elements (XieXianshan via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225114 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-28 06:48:31 +00:00
Aaron Myers
a500ba50c2 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1224965 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-27 18:18:36 +00:00
Alejandro Abdelnur
ae0d48854d HDFS-2707. HttpFS should read the hadoop-auth secret from a file instead inline from the configuration. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224794 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-26 19:37:25 +00:00
Mahadev Konar
55ad01711e HADOOP-7890. Redirect hadoop script's deprecation message to stderr. (Koji Knoguchi via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221849 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 19:34:09 +00:00
Eli Collins
f9b2197d2a HADOOP-7837. no NullAppender in the log4j config. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221348 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 17:17:26 +00:00
Todd Lipcon
009dfed8d7 HADOOP-7932. Make client connection retries on socket time outs configurable. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220957 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 21:32:55 +00:00
Todd Lipcon
8ff28f4549 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 05:34:51 +00:00
Todd Lipcon
45e81ae415 HADOOP-7925. Add interface and update CLI to query current state to HAServiceProtocol. Contributed by Eli Collins. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220611 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 05:21:24 +00:00
Todd Lipcon
191b56d802 HADOOP-7657. Add support for LZ4 compression. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220314 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 00:54:18 +00:00
Aaron Myers
08c9dc3780 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:31:46 +00:00
Aaron Myers
059290ce3a HADOOP-7931. o.a.h.ipc.WritableRpcEngine should have a way to force initialization. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215358 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:14:36 +00:00
Mahadev Konar
6d551b83de MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215065 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 09:09:28 +00:00
Aaron Myers
116bf57bd6 HADOOP-7928. HA: Client failover policy is incorrectly trying to fail over all IOExceptions. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215019 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 01:54:44 +00:00
Aaron Myers
d937abd434 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214944 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-15 20:05:38 +00:00
Alejandro Abdelnur
6cf3a15c52 HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214790 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-15 14:41:01 +00:00
Todd Lipcon
b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 23:34:04 +00:00
Doug Cutting
3758710bff HADOOP-7920. Remove a few more bits that are no longer required. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214499 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 21:57:55 +00:00
Suresh Srinivas
d9c9fb913e HADOOP-7920. Remove Avro Rpc. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214114 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:45:59 +00:00
Todd Lipcon
d5a658e7a4 HADOOP-7921. StandbyException should extend IOException. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214093 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:10:34 +00:00
Todd Lipcon
9cf3e0805f HADOOP-7922. Improve some logging for client IPC failovers and StandbyExceptions. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214082 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 07:51:30 +00:00
Aaron Myers
9818091a66 HADOOP-7896. HA: if both NNs are in Standby mode, client needs to try failing back and forth several times with sleeps. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214076 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 07:24:36 +00:00
Todd Lipcon
fac14e799a HADOOP-7892. IPC logs too verbose after "RpcKind" introduction. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213954 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 21:59:34 +00:00
Alejandro Abdelnur
0201be46c2 HADOOP-7810. move hadoop archive to core from tools. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213907 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 20:17:59 +00:00
Aaron Myers
a0fe4f476a Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213867 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 19:02:37 +00:00
Sanjay Radia
186df142cc HADOOP-7913 Fix bug in ProtoBufRpcEngine (sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213619 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 09:18:04 +00:00
Tsz-wo Sze
40cc6fc292 HADOOP-7914. Remove the duplicated declaration of hadoop-hdfs test-jar in hadoop-project/pom.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213598 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 08:47:47 +00:00
Thomas White
6fc7e2e002 HADOOP-7912. test-patch should run eclipse:eclipse to verify that it does not break again. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213432 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 20:45:30 +00:00
Aaron Myers
89379bc1a3 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213389 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 19:41:20 +00:00
Steve Loughran
0f70398292 HADOOP-7878 Regression: HADOOP-7777 switch changes break HDFS tests when the isSingleSwitch() predicate is used 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213263 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 15:05:16 +00:00
Konstantin Shvachko
3128c78636 JDiff output for release 0.22.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213146 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 05:45:08 +00:00
Konstantin Shvachko
2c1ee1d342 Preparing for release 0.22.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213121 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 00:26:01 +00:00
Eli Collins
604f99e367 Fixup changelog for HADOOP-7898 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212838 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-10 18:27:40 +00:00
Alejandro Abdelnur
ad7d537caa HADOOP-7899. Generate proto java files as part of the build. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212615 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-09 20:37:57 +00:00
Alejandro Abdelnur
66fce20802 HADOOP-7902. skipping name rules setting (if already set) should be done on UGI initialization only. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212591 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-09 19:28:25 +00:00
Amar Kamat
b4afbe6c8d Added Uma's name to the CHANGES.txt file for HADOOP-7851. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212288 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-09 09:08:07 +00:00
Amar Kamat
82d57ee7fe HADOOP-7851. Configuration.getClasses() never returns the default value. (amarrk) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212282 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-09 08:50:09 +00:00
Eli Collins
7584901685 HADOOP-7870. fix SequenceFile#createWriter with boolean createParent arg to respect createParent. Contributed by Jon Hsieh 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212084 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 20:20:16 +00:00
Eli Collins
2deaca4415 HADOOP-6886. LocalFileSystem Needs createNonRecursive API. Contributed by Nicolas Spiegelberg and Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212073 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 19:57:14 +00:00
Eli Collins
dec526076f HADOOP-6840. Support non-recursive create() in FileSystem and SequenceFile.Writer. Contributed by Jitendra and Eli 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212062 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 19:29:02 +00:00
Alejandro Abdelnur
3334306512 HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212060 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 19:25:28 +00:00
Suresh Srinivas
8cd80b3cbc HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212021 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 18:24:30 +00:00
Suresh Srinivas
4283ac6d7a HADOOP-7897. ProtobufRpcEngine client side exception mechanism is not consistent with WritableRpcEngine. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212004 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 17:47:06 +00:00
Aaron Myers
d9ea5bb489 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1211749 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 02:57:47 +00:00
Aaron Myers
d9690b0922 HADOOP-7888. TestFailoverProxy fails intermittently on trunk. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211728 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 01:21:24 +00:00
Alejandro Abdelnur
58361d3f34 HADOOP-7887. KerberosAuthenticatorHandler is not setting KerberosName name rules from configuration. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211673 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-07 22:17:35 +00:00
Jakob Homan
788f28b679 HADOOP-7886. Add toString to FileStatus. Contributed by SreeHari. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210793 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-06 06:35:02 +00:00
Aaron Myers
8a4db4d331 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1210547 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-05 18:00:44 +00:00
Suresh Srinivas
0acc00bbab HADOOP-7876. Provided access to encoded key in DelegationKey for use in protobuf based RPCs. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210320 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-05 03:40:34 +00:00
Suresh Srinivas
560c8946ea HADOOP-7875. Add helper class to unwrap protobuf ServiceException. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210319 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-05 03:33:15 +00:00
Sanjay Radia
65200998c0 HADOOP-7862 Move the support for multiple protocols to lower layer so that Writable, PB and Avro can all use it (includes HDFS and MR changes to match) (Sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210208 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-04 20:44:36 +00:00
Alejandro Abdelnur
c5777e0375 HADOOP-7874. native libs should be under lib/native/ dir. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209286 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 22:44:29 +00:00
Tsz-wo Sze
6b555008f3 HADOOP-7877. Update balancer CLI usage documentation to include the new -policy option. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209246 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 21:19:01 +00:00
Aaron Myers
2033b52673 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1209169 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 18:15:46 +00:00
Alejandro Abdelnur
f5cffab738 HDFS-2614. hadoop dist tarball is missing hdfs headers. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208928 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 01:19:35 +00:00
Jitendra Nath Pandey
efc83da2a0 HADOOP-7854. UGI getCurrentUser is not synchronized. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208926 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 01:13:42 +00:00
Alejandro Abdelnur
d8930feeae HADOOP-7853. multiple javax security configurations cause conflicts. (daryn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208751 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 20:26:36 +00:00
Aaron Myers
0eec2218a1 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1208644 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 18:27:04 +00:00
Eli Collins
670fa8770b HADOOP-7864. Building mvn site with Maven < 3.0.2 causes OOM errors. Contributed by Andrew Bayer 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208153 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 00:03:40 +00:00
Jitendra Nath Pandey
65681d5716 HADOOP-7804. Enable hadoop config generator to set configurations to enable short circuit read. Contributed by Arpit Gupta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208144 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 23:43:57 +00:00
Aaron Myers
ee97365f58 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1208002 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 17:55:28 +00:00
Steve Loughran
3c602e0ee0 Apply HADOOP-7777 to 0.23.1 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207629 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 21:34:03 +00:00
Steve Loughran
18d9942855 HADOOP-7863: apply HADOOP-7424 to 0.23.1 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207614 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 21:18:25 +00:00
Aaron Myers
73b3de6204 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1207490 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 18:21:46 +00:00