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

511 Commits

Author SHA1 Message Date
Tsz-wo Sze
8dfef7d2dc HDFS-2827. When the parent of a directory is the root, renaming the directory results in leases updated incorrectly. Contributed by Uma Maheswara Rao G 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238700 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 17:36:42 +00:00
Eli Collins
6be13332db HDFS-2853. HA: NN fails to start if the shared edits dir is marked required. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238134 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 02:17:53 +00:00
Todd Lipcon
641f79a325 HDFS-2824. Fix failover when prior NN died just after creating an edit log segment. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238069 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 23:05:18 +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
Aaron Myers
9a8f119741 Amend HDFS-2841 to include new file which was omitted from original commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237971 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 20:32:35 +00:00
Todd Lipcon
846f97312c HDFS-2691. Fixes for pipeline recovery in an HA cluster: report RBW replicas immediately upon pipeline creation. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237935 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-30 19:16:15 +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
Jitendra Nath Pandey
98302971c2 HDFS-2801. Provide a method in client side translators to check for a methods supported in underlying protocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237192 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-29 02:01:24 +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
Aaron Myers
976c07696d HDFS-2759. Pre-allocate HDFS edit log files after writing version number. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237153 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 20:26:13 +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
Todd Lipcon
da91e0d427 HDFS-2791. If block report races with closing of file, replica is incorrectly marked corrupt. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236945 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 00:42:34 +00:00
Alejandro Abdelnur
0d5b734681 HDFS-2840. TestHostnameFilter should work with localhost or localhost.localdomain (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236940 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 00:24:46 +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
Jitendra Nath Pandey
e7775e0b3b HDFS-2805. Add a test for a federated cluster with HA NNs. Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236471 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-27 00:34:37 +00:00
Eli Collins
fdf7b18247 HDFS-2838. NPE in FSNamesystem when in safe mode. Contributed by Gregory Chanan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236450 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 23:48:08 +00:00
Alejandro Abdelnur
cf16929584 HDFS-2837. mvn javadoc:javadoc not seeing LimitedPrivate class (revans2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236338 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 18:15:04 +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
Alejandro Abdelnur
a7091893de HDFS-2836. HttpFSServer still has 2 javadoc warnings in trunk (revans2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236328 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 17:58:42 +00:00
Jitendra Nath Pandey
dea3164e00 HDFS-2809. Add test to verify that delegation tokens are honored after failover. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235495 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 21:06:27 +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
Harsh J
7c69883917 HDFS-442. dfsthroughput in test jar throws NPE (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235137 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-24 06:10:28 +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
Todd Lipcon
1525aae4b3 HDFS-2826. Add test case for HDFS-1476 (safemode can initialize replication queues before exiting) (todd) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235067 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 23:42:17 +00:00
Todd Lipcon
465663afbf HDFS-2804. Should not mark blocks under-replicated when exiting safemode. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235033 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 22:22:46 +00:00
Todd Lipcon
c0016ba85f HDFS-2825. Add test hook to turn off the writer preferring its local DN. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235025 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 22:07:49 +00:00
Todd Lipcon
8d1c996242 HDFS-2688. Add tests for quota tracking in an HA cluster. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235017 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 21:57:00 +00:00
Todd Lipcon
c10853a6b9 HDFS-2820. Add a simple sanity check for HA config. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235013 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 21:49:43 +00:00
Todd Lipcon
12645ff6c0 HDFS-2822. processMisReplicatedBlock incorrectly identifies under-construction blocks as under-replicated. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234925 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 18:11:09 +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
Harsh J
ece854211f HDFS-2818. Fix a missing space issue in HDFS webapps' title tags. (Devaraj K via harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234555 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-22 17:30:33 +00:00
Aaron Myers
c3e62de9ce HDFS-2737. Automatically trigger log rolls periodically on the active NN. Contributed by Todd Lipcon and Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234256 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-21 03:17:26 +00:00
Todd Lipcon
c840548d6b HDFS-2817. Combine the two TestSafeMode test suites. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234221 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-21 00:42:35 +00:00
Alejandro Abdelnur
654b90fa23 HDFS-2816. Fix missing license header in httpfs findbugsExcludeFile.xml. (hitesh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234135 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 21:04:24 +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
f7d20b2198 HDFS-2751. Datanode may incorrectly drop OS cache behind reads even for short reads. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233796 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 07:32:06 +00:00
Todd Lipcon
520a39ac2d HDFS-2810. Leases not getting renewed properly by clients. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233794 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 07:26:19 +00:00
Todd Lipcon
1aed1296dd HDFS-2812. When becoming active, the NN should treat all leases as freshly renewed. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233612 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 22:35:04 +00:00
Eli Collins
fa6033a029 HDFS-2768. BackupNode stop can not close proxy connections because it is not a proxy instance. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233584 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 21:41:50 +00:00
Aaron Myers
02919e61f6 HDFS-2367. Enable the configuration of multiple HA cluster addresses. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233549 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 19:41:48 +00:00
Aaron Myers
3e17cdde56 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233533 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 19:02:07 +00:00
Todd Lipcon
1d2e706dd1 HDFS-2803. Add logging to LeaseRenewer for better lease expiration debugging. Contributed by Jimmy Xiang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233453 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 16:35:25 +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
Todd Lipcon
a380dc8732 HDFS-2592. Balancer support for HA namenodes. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232531 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 18:39:09 +00:00
Todd Lipcon
4c7a6c6c3f Amend HDFS-2795. Fix PersistBlocks failure due to an NPE in isPopulatingReplQueues() 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232510 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 17:57:36 +00:00
Todd Lipcon
0c1450ca5d HDFS-2795. Standby NN takes a long time to recover from a dead DN starting up. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232285 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-17 03:21:08 +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
Eli Collins
c53c94ec46 Update changelog for HDFS-362 to reflect the merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232205 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-16 22:43:11 +00:00
Aaron Myers
d880c7cc78 HDFS-2772. On transition to active, standby should not swallow ELIE. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232197 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-16 22:16:15 +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
Todd Lipcon
2f26475a39 HDFS-2747. Entering safe mode after starting SBN can NPE. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232176 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-16 21:46:05 +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
Eli Collins
f02ea82bd1 HDFS-2790. FSNamesystem.setTimes throws exception with wrong configuration name in the message. Contributed by Arpit Gupta 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231572 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-14 19:50:14 +00:00
Eli Collins
6b8bcfa916 HDFS-2788. HdfsServerConstants#DN_KEEPALIVE_TIMEOUT is dead code. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231569 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-14 19:45:12 +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
Jitendra Nath Pandey
6234f3d91c HADOOP-2776. Missing interface annotation on JournalSet. Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230412 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-12 06:21:05 +00:00
Harsh J
dcea80a21b HDFS-69. Improve the 'dfsadmin' commandline help. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230398 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-12 05:13:19 +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
Aaron Myers
3e76f00baa Fix expected error text in assertion. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230254 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 21:14:30 +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
Aaron Myers
4f1bf2fe23 HDFS-2738. FSEditLog.selectinputStreams is reading through in-progress streams even when non-in-progress are requested. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229931 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 08:32:10 +00:00
Aaron Myers
a339836bbc HDFS-2766. Test for case where standby partially reads log and then performs checkpoint. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229929 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 08:26:18 +00:00
Todd Lipcon
a4f4becf52 HDFS-2775. Fix TestStandbyCheckpoints.testBothNodesInStandbyState failing intermittently. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229901 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 06:14:13 +00:00
Todd Lipcon
298e867673 HDFS-2773. Reading edit logs from an earlier version should not leave blocks in under-construction state. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229900 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 06:08:13 +00:00
Todd Lipcon
190dc1c91b HDFS-2753. Fix standby getting stuck in safemode when blocks are written while SBN is down. Contributed by Hari Mankude and Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229898 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 05:55:32 +00:00
Tsz-wo Sze
1c8e3e8854 Add HDFS-2499 to CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229897 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 05:40:57 +00:00
Jitendra Nath Pandey
8faf7e8fb6 HDFS-2739. SecondaryNameNode doesn't start up. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229877 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-11 02:54:48 +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
Todd Lipcon
526efb48a6 HDFS-2762. Fix TestCheckpoint timing out on HA branch. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229464 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-10 03:29:02 +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
Aaron Myers
a7195bdd14 HDFS-2765. TestNameEditsConfigs is incorrectly swallowing IOE. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229028 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 04:53:20 +00:00
Todd Lipcon
736b1860ab HDFS-2730. Refactor shared HA-related test code into HATestUtil class. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229023 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-09 04:12:37 +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
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
Todd Lipcon
9a07ba8945 HDFS-2709. Appropriately handle error conditions in EditLogTailer. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228390 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 20:44:05 +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
Jitendra Nath Pandey
4efd3699a6 HDFS-2697. Move RefreshAuthPolicy, RefreshUserMappings, GetUserMappings protocol to protocol buffers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227887 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 23:03:31 +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
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
472e971891 HDFS-2710. Add HDFS tests related to HADOOP-7933. Contributed by Siddarth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227756 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 18:57:01 +00:00
Todd Lipcon
5b8dcb20a2 HDFS-2291. Allow the StandbyNode to make checkpoints in an HA setup. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227411 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 00:22:54 +00:00
Todd Lipcon
d004ddee76 HDFS-2720. Fix MiniDFSCluster HA support to work properly on Windows. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227284 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-04 19:50:41 +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
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
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
05ed36cd52 HDFS-2722. HttpFs should not be using an int for block size. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226861 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-03 16:47:49 +00:00
Harsh J
8e8203f3c5 HDFS-554. Use System.arraycopy in BlockInfo.ensureCapacity. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226239 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-01 12:06:49 +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
Todd Lipcon
737df8b67b HDFS-2716. Configuration needs to allow different dfs.http.addresses for each HA NN. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1226020 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-31 01:53:23 +00:00
Todd Lipcon
20a6560bdf HDFS-2692. Fix bugs related to failover from/into safe mode. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225709 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 00:30:27 +00:00
Todd Lipcon
15ebdd5664 HDFS-2714. Fix test cases which use standalone FSNamesystems. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225708 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 00:25:21 +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
6c349f9420 HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225591 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-29 16:51:59 +00:00
Harsh J
41737432c0 HDFS-2726. Fix a logging issue under DFSClient's createBlockOutputStream method (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225456 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-29 07:22:54 +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
Alejandro Abdelnur
6b4f40cbf9 HttpFS server should check that upload requests have correct content-type. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221616 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 05:26:20 +00:00
Todd Lipcon
31c91706f7 HDFS-1972. Fencing mechanism for block invalidations and replications. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1221608 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 04:32:40 +00:00
Todd Lipcon
36d1c49486 HDFS-2693. Fix synchronization issues around state transition. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1221582 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 03:03:23 +00:00
Alejandro Abdelnur
8fe3dd3fea HDFS-2657. TestHttpFSServer and TestServerWebApp are failing on trunk. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221580 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 03:03:16 +00:00
Alejandro Abdelnur
45620eee68 HDFS-2646. Hadoop HttpFS introduced 4 findbug warnings. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221572 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 02:46:04 +00:00
Tsz-wo Sze
3503d9a4a8 HDFS-2706. Use configuration for blockInvalidateLimit if it is set. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221106 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 05:49:24 +00:00
Todd Lipcon
57ef902bbc HDFS-2682. When a FailoverProxyProvider is used, Client should not retry for 45 times if it is timing out to connect to server. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220965 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 21:49:39 +00:00
Todd Lipcon
4bb0456c66 HDFS-2678. When a FailoverProxyProvider is used, DFSClient should not retry connection ten times before failing over. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220942 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 20:57:13 +00:00
Todd Lipcon
08bde10e24 Merge trunk into HA branch to pick up fix for bkjournal findbugs 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220941 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 20:46:58 +00:00
Todd Lipcon
dfba847eb6 Amend HDFS-234 (bkjournal contrib). Fix findbugs build 
- Fixes pom parent to point to hadoop-project instead of hadoop-project-dist
- Fix relative path in pom to have the correct number of ../s


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220940 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 20:42:25 +00:00
Alejandro Abdelnur
de928a4aa0 HDFS-2658. HttpFS introduced 70 javadoc warnings. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220810 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 15:53:53 +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
625d1b380a HDFS-2677. Web UI should indicate the NN state. Contributed by Eli Collins. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220613 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 05:26:07 +00:00
Todd Lipcon
329717264f HDFS-2679. Add interface to query current state to HAServiceProtocol. Contributed by Eli Collins. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220612 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-19 05:24:32 +00:00
Eli Collins
5e185702ea HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy. Contributed by Uma Maheswara Rao G 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220510 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 18:12:48 +00:00
Todd Lipcon
a89baed833 HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220317 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 01:13:00 +00:00
Todd Lipcon
fa1edc9a1e HDFS-2700. Fix failing TestDataNodeMultipleRegistrations in trunk. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220315 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 01:10:49 +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
Suresh Srinivas
89553be90e HDFS-2687. Tests failing with ClassCastException post protobuf RPC changes. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215366 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:26:46 +00:00
Aaron Myers
52c1491155 HDFS-2694. Removal of Avro broke non-PB NN services. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215364 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:19:01 +00:00
Thomas White
9b7617a909 HDFS-2640. Javadoc generation hangs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215354 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-17 00:09:04 +00:00
Todd Lipcon
371f4228e8 HDFS-2684. Fix up some failing unit tests on HA branch. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215241 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 18:36:24 +00:00
Todd Lipcon
cdb9f01ad4 HDFS-2667. Fix transition from active to standby. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215037 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 04:25:13 +00:00
Aaron Myers
71071b904d HDFS-2602. NN should log newly-allocated blocks without losing BlockInfo. Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215036 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-16 04:18:58 +00:00
Aaron Myers
353bc3799d HDFS-2689. HA: BookKeeperEditLogInputStream doesn't implement isInProgress(). Contributed by Aaron T. Myers 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214965 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-15 21:54:00 +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
afd0333196 HDFS-2683. Authority-based lookup of proxy provider fails if path becomes canonicalized. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214579 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-15 00:42:50 +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
Todd Lipcon
ecdf9da770 Fix treatment of NNHAStatusHeartbeat in protobuffer. 
Committing without pre-commit review since it's a pretty trivial merge fix


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214543 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 23:28:43 +00:00
Todd Lipcon
8134b1c870 Merge trunk into HA branch. 
Several conflicts around introduction of protobuf translator for DatanodeProtocol - mostly trivial resolutions.

NB: this does not successfully pass any tests since the HAStatus field needs
to be integrated into the HeartbeatResponse Protobuf implementation.
That will be a separate commit for clearer history.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214518 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 22:47:41 +00:00
Todd Lipcon
6c2da4bc0f HDFS-2680. DFSClient should construct failover proxy with exponential backoff. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214487 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 21:41:31 +00:00
Sanjay Radia
d8dfcdcbc2 HDFS-2669 Enable protobuf rpc for ClientNamenodeProtocol 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214128 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 09:27:51 +00:00
Todd Lipcon
7e8accd68e HDFS-2671. NN should throw StandbyException in response to RPCs in STANDBY state. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214117 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:56:21 +00:00
Suresh Srinivas
95bdb29aaf r1214102 should have removed the file. Committing this to remove empty file. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214103 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:25:47 +00:00
Suresh Srinivas
60dd76c6ab HDFS-2676. Remove Avro RPC. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214102 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:20:23 +00:00
Todd Lipcon
b9238e3bad HDFS-2675. Reduce warning verbosity when double-closing edit logs. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214098 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 08:13:55 +00:00
Eli Collins
bdc2a77d6b HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214046 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 03:42:24 +00:00
Jitendra Nath Pandey
3cffe34177 HDFS-2661. Enable protobuf RPC for DatanodeProtocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214033 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 02:15:37 +00:00
Tsz-wo Sze
433a6e78f6 HDFS-2545. Change WebHDFS to support multiple namenodes in federation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214027 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 01:47:57 +00:00
Suresh Srinivas
3954a2fb1c HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213985 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:31:44 +00:00
Suresh Srinivas
6a609cb471 Reverting the patch r1213981 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213984 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:27:58 +00:00
Jitendra Nath Pandey
1f2f4e105b HDFS-234. Integration with BookKeeper logging system. Contributed by Ivan Kelly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213983 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:27:13 +00:00
Suresh Srinivas
b5229fd19b HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213981 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:22:28 +00:00
Suresh Srinivas
3001a172c8 Reverting r1213512 because it committed changes that were not part of the patch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213980 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 23:17:02 +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
Suresh Srinivas
f2f4e93413 HDFS-2650. Replace @inheritDoc with @Override. Contributed by Hari Mankude. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213813 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 18:07:29 +00:00
Suresh Srinivas
4ec8424e5d HDFS-2666. Fix TestBackupNode failure. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213808 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 17:59:37 +00:00
Eli Collins
c3f7c1f3e5 Add missing file to previous commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213593 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 08:10:29 +00:00