Commit Graph

632 Commits

Author SHA1 Message Date
Aaron Myers e58b7e202b HDFS-3014. FSEditLogOp and its subclasses should have toString() method. Contributed by Sho Shimauchi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294926 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 01:17:37 +00:00
Aaron Myers 978a8050e2 HDFS-2920. fix remaining TODO items. Contributed by Aaron T. Myers and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294923 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 01:09:07 +00:00
Aaron Myers c69dfdd5e1 HDFS-2958. Sweep for remaining proxy construction which doesn't go through failover path.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294811 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 20:09:18 +00:00
Jitendra Nath Pandey daf782ca7e HDFS-3016. Security in unit tests. Contributed by Jaimin Jetly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294773 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:41:25 +00:00
Todd Lipcon 1ab31b1715 HDFS-3019. Fix silent failure of TestEditLogJournalFailures. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294772 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:38:40 +00:00
Aaron Myers 375c6b8f2e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294762 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:33:41 +00:00
Todd Lipcon 7decf112c0 HDFS-3024. Improve performance of stringification in addStoredBlock. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294754 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:04:13 +00:00
Aaron Myers 586bd479cb Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294445 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 02:21:42 +00:00
Tsz-wo Sze 12b3ce7205 Move entries to 0.23.3 in CHANGES.txt for the 0.23-PB merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294431 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 01:10:53 +00:00
Todd Lipcon da9aa34bec HDFS-3013. HA: NameNode format doesn't pick up dfs.namenode.name.dir.NameServiceId configuration. Contributed by Mingjie Lai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294425 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:43:54 +00:00
Aaron Myers ae9014ef6a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1293742 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 04:57:17 +00:00
Aaron Myers b57260f848 HDFS-2978. The NameNode should expose name dir statuses via JMX. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293707 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 22:14:53 +00:00
Arun Murthy 1de3fa8653 Preparing for 0.23.3 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293506 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:37:07 +00:00
Tsz-wo Sze dacbeb5f67 HDFS-3006. In WebHDFS, when the return body is empty, set the Content-Type to application/octet-stream instead of application/json.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293487 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 00:15:37 +00:00
Todd Lipcon 481f84597b HDFS-2904. Client support for getting delegation tokens. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1293486 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 00:03:26 +00:00
Suresh Srinivas 5293e5d1c5 HDFS-3002. TestNameNodeMetrics need not wait for metrics update. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293482 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 23:52:20 +00:00
Eli Collins 78f22bc525 HDFS-3008. Negative caching of local addrs doesn't work. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293419 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:14:04 +00:00
Suresh Srinivas 0e79131981 HDFS-3009. Remove duplicate code in DFSClient#isLocalAddress by using NetUtils. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293390 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 19:29:41 +00:00
Aaron Myers 62c7e2edfc HDFS-3003. Remove getHostPortString() from NameNode, replace it with NetUtils.getHostPortString(). Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293338 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 17:03:17 +00:00
Aaron Myers f3026e1085 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292838 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 16:06:53 +00:00
Eli Collins 2e9b8df963 HDFS-2993. HA: BackupNode#checkOperation should permit CHECKPOINT operations. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292688 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 07:58:33 +00:00
Tsz-wo Sze f11b0788df HDFS-2981. In hdfs-default.xml, the default value of dfs.client.block.write.replace-datanode-on-failure.enable should be true.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1292626 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 02:27:07 +00:00
Tsz-wo Sze af70addc94 Move HDFS-2944 entry to 0.23 in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1292624 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 02:23:46 +00:00
Eli Collins 8db31c5972 HDFS-2922. HA: close out operation categories. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292620 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 02:08:54 +00:00
Todd Lipcon 90a14f89e1 HDFS-2973. Re-enable NO_ACK optimization for block deletion. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292611 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 01:25:14 +00:00
Todd Lipcon 475db83b87 HDFS-2985. Improve logging when replicas are marked as corrupt. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1292609 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 01:16:33 +00:00
Todd Lipcon 7527e943e6 HDFS-2972. Small optimization building incremental block report. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292497 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 20:37:28 +00:00
Todd Lipcon c14912785d HDFS-2929. Stress test and fixes for block synchronization. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292494 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 20:31:52 +00:00
Tsz-wo Sze efbc58f30c HDFS-2907. Add a conf property dfs.datanode.fsdataset.factory to make FSDataset in Datanode pluggable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1292419 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 17:47:39 +00:00
Aaron Myers f0db867292 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1291400 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 18:33:37 +00:00
Aaron Myers d03dac7432 HDFS-2974. MiniDFSCluster does not delete standby NN name dirs during format. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1291126 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 04:12:01 +00:00
Steve Loughran a57b9b8335 HDFS-2725 script to mention dfs command
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245943 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 15:25:11 +00:00
Aaron Myers 41e56dfece HDFS-2952. NN should not start with upgrade option or with a pending an unfinalized upgrade. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245875 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 07:12:27 +00:00
Arun Murthy e38b7e6ddd Preparing for hadoop-0.23.1-rc2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245845 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 02:30:48 +00:00
Todd Lipcon ef5d7156db Merge trunk into HA branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245834 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:27:51 +00:00
Todd Lipcon 9ae4fac8dd HDFS-2968. Protocol translator for BlockRecoveryCommand broken when multiple blocks need recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245832 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:18:01 +00:00
Todd Lipcon a8e7f745cd HDFS-2969. ExtendedBlock.equals is incorrectly implemented. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245830 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:13:09 +00:00
Eli Collins dd732d5a24 Fix TestViewFsFileStatusHdfs per previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245762 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 21:04:20 +00:00
Aaron Myers 53b7d6c6bc Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245690 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 18:19:31 +00:00
Aaron Myers 7933dc5838 HDFS-2586. Add protobuf service and implementation for HAServiceProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245338 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 07:37:43 +00:00
Suresh Srinivas 1a03127385 HDFS-2937. TestDFSHAAdmin needs tests with MiniDFSCluster. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245326 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 06:40:40 +00:00
Suresh Srinivas 257e9440ed Moving HDFS-2525 to relevant release section (0.23.2) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245312 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 03:56:45 +00:00
Aaron Myers 153e0cc37a HDFS-2955. IllegalStateException during standby startup in getCurSegmentTxId. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245230 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 22:45:40 +00:00
Jitendra Nath Pandey b8448dea82 HDFS-2655. BlockReaderLocal#skip performs unnecessary IO. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245118 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 18:58:19 +00:00
Aaron Myers 833e96534f Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245117 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 18:35:32 +00:00
Aaron Myers 83a922b55e ConfiguredFailoverProxyProvider should not create a NameNode proxy with an underlying retry proxy. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244845 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 03:59:09 +00:00
Todd Lipcon 0663b51ed4 Amend HDFS-2948. NN throws NPE during shutdown if it fails to startup
Previous patch missed the case where the NN fails to start up when it's starting in standby state.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244813 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 00:58:03 +00:00
Todd Lipcon f7f2ef4447 HDFS-2935. Shared edits dir property should be suffixed with nameservice and namenodeID. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244761 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:20:37 +00:00
Todd Lipcon 05151ecf79 HDFS-2934. Allow configs to be scoped to all NNs in the nameservice. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244759 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:19:12 +00:00
Jitendra Nath Pandey 3c145d3492 HDFS-2909. HA: Inaccessible shared edits dir not getting removed from FSImage storage dirs upon error. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244753 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:00:18 +00:00
Suresh Srinivas ff91453227 HDFS-2938. Recursive delete of a large directory make namenode unresponsive. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244752 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:00:08 +00:00
Aaron Myers 1fb0ab92f8 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244645 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 19:04:17 +00:00
Jitendra Nath Pandey f82e862e1f HDFS-2525. Race between BlockPoolSliceScanner and append. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244640 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:43:01 +00:00
Todd Lipcon 3bd230af11 HDFS-2950. Secondary NN HTTPS address should be listed as a NAMESERVICE_SPECIFIC_KEY. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244635 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:27:37 +00:00
Aaron Myers 011611c765 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244202 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 20:37:10 +00:00
Todd Lipcon 439490f915 HDFS-2948. NN throws NPE during shutdown if it fails to startup. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244186 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 19:38:02 +00:00
Aaron Myers a0e4ae55f2 HDFS-2942. TestActiveStandbyElectorRealZK fails if build dir does not exist. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243827 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 08:43:58 +00:00
Aaron Myers 1b2ecc6336 HDFS-2947. On startup NN throws an NPE in the metrics system. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243826 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 08:42:25 +00:00
Aaron Myers a87328dfab HDFS-2943. Expose last checkpoint time and transaction stats as JMX metrics. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243822 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 08:27:15 +00:00
Todd Lipcon db187cf40e Merge trunk into HA branch.
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243691 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 21:00:37 +00:00
Aaron Myers 2acafd1783 HDFS-2944. Typo in hdfs-default.xml causes dfs.client.block.write.replace-datanode-on-failure.enable to be mistakenly disabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243690 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 20:57:48 +00:00
Suresh Srinivas a70bc6c6a2 HDFS-2815. Namenode sometimes oes not come out of safemode during NN crash + restart. Contributed by Uma Maheswara Rao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243673 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 20:11:43 +00:00
Tsz-wo Sze 52004aa8e9 HDFS-776. Fix exception handling in Balancer. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243654 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 19:07:04 +00:00
Aaron Myers f6e407b436 HDFS-2939. TestHAStateTransitions fails on Windows. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243293 13f79535-47bb-0310-9956-ffa450edef68
2012-02-12 18:43:39 +00:00
Harsh J 8b730c867f HDFS-2869. Fix an error in the webhdfs docs for the mkdir op (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243104 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 17:13:30 +00:00
Todd Lipcon 8be9441b9b HDFS-2878. Fix TestBlockRecovery and move it back into main test directory. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242995 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 01:20:59 +00:00
Tsz-wo Sze 83fd3160da HDFS-2931. Switch DataNode's BlockVolumeChoosingPolicy to private-audience. Contributed by harsh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242891 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 19:15:15 +00:00
Todd Lipcon a626fa04f9 Revert HDFS-2922 via svn merge -c -1242572
The patch broke a lot of unit tests in the nightly build. Will recommit after it is fixed.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242874 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 18:17:21 +00:00
Aaron Myers 05d56e5e7e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242871 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 18:01:01 +00:00
Tsz-wo Sze dc847b39fd HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242636 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 02:05:38 +00:00
Todd Lipcon c14bb61a82 Merge trunk into HA branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242635 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 01:49:08 +00:00
Eli Collins 8af96c7b22 HDFS-2917. HA: haadmin should not work if run by regular user. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242626 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 00:46:17 +00:00
Eli Collins a63e12c4c8 HDFS-2922. HA: close out operation categories. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242572 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 22:33:20 +00:00
Aaron Myers 467059b4ab HDFS-2912. Namenode not shutting down when shared edits dir is inaccessible. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242564 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 22:23:47 +00:00
Aaron Myers 3c6863ab4a Update CHANGES.txt to reflect the back-port of HDFS-2764 from trunk to branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242554 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 22:09:25 +00:00
Jitendra Nath Pandey b5d02a63cb HDFS-2915. HA: TestFailureOfSharedDir.testFailureOfSharedDir() has race condition. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242522 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 21:08:17 +00:00
Todd Lipcon 5e26de982b HDFS-2924. Standby checkpointing fails to authenticate in secure cluster. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242439 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 18:22:02 +00:00
Aaron Myers bad0a2a4a1 HDFS-2510. Add HA-related metrics. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242410 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 17:39:50 +00:00
Todd Lipcon e918b91e23 HDFS-2579. Starting delegation token manager during safemode fails. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242225 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 06:12:01 +00:00
Todd Lipcon a1574e1715 HDFS-2923. Namenode IPC handler count uses the wrong configuration key. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242220 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 05:28:40 +00:00
Jitendra Nath Pandey 987449b9b8 HDFS-2908. Add apache license header for StorageReport.java. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242192 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 00:24:06 +00:00
Tsz-wo Sze b6ffb08a46 HDFS-2887. FSVolume, is a part of FSDatasetInterface implementation, should not be referred outside FSDataset. A new FSVolumeInterface is defined. The BlockVolumeChoosingPolicy.chooseVolume(..) method signature is also updated. (szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242087 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 20:58:29 +00:00
Arun Murthy 647f374607 Preparing for release 0.23.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241795 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 07:27:58 +00:00
Aaron Myers 4d3dc530e8 HDFS-2764. TestBackupNode is racy. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241780 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 05:38:29 +00:00
Jitendra Nath Pandey 11db1b855f HDFS-2786. Fix host-based token incompatibilities in DFSUtil. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241766 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 03:55:36 +00:00
Jitendra Nath Pandey b9e74da41b HDFS-2905. HA: Standby NN NPE when shared edits dir is deleted. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1241757 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 03:17:09 +00:00
Suresh Srinivas 8e524e731c Fixing 0.23.1 version of the CHANGES.txt to make it consistent with the CHANGES.txt from 0.23.1 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241751 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 02:58:28 +00:00
Arun Murthy eabe75d6f2 HDFS-2572. Moved to trunk section from 0.23.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241746 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 02:31:26 +00:00
Jitendra Nath Pandey acacde55e6 HDFS-2901. Improvements for SBN web UI - not show under-replicated/missing blocks. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1241568 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:29:39 +00:00
Suresh Srinivas 28eadb7cd7 HDFS-2899. Service protocol changes in DatanodeProtocol to add multiple storages. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241519 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 16:59:48 +00:00
Todd Lipcon 7f0a99f6e6 HDFS-2794. Active NN may purge edit log files before standby NN has a chance to read them. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1241317 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 01:39:14 +00:00
Konstantin Shvachko 7e4bd89590 HDFS-2886. CreateEditLogs should generate a realistic edit log. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241296 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 00:44:27 +00:00
Aaron Myers db7c013877 HDFS-2733. Document HA configuration and CLI. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1241183 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 21:18:11 +00:00
Suresh Srinivas 2a9e430ff9 HDS-2895. Remove Writable wire protocol types and translators to complete transition to protocol buffers. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241007 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 13:33:35 +00:00
Eli Collins b837bbb7d5 HDFS-2893. The start/stop scripts don't start/stop the 2NN when using the default configuration. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240928 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:52:50 +00:00
Eli Collins 296b6c0063 HDFS-2894. HA: automatically determine the nameservice Id if only one nameservice is configured. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240917 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:25:52 +00:00
Eli Collins 2e4cf977ae HDFS-2752. HA: exit if multiple shared dirs are configured. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240916 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:24:11 +00:00
Eli Collins c17b4f8eef HDFS-2819. Document new HA-related configs in hdfs-default.xml. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240914 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:21:06 +00:00
Harsh J da7b0d90c6 HDFS-2868. Expose xceiver counts via the DataNode MXBean. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240897 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 05:25:12 +00:00
Suresh Srinivas f88574acde HDFS-2880. Protobuf chagnes in DatanodeProtocol to add multiple storages. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240653 13f79535-47bb-0310-9956-ffa450edef68
2012-02-05 01:39:30 +00:00
Eli Collins a660c5dd2c Add missing file from previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240601 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 20:13:48 +00:00
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
Jitendra Nath Pandey 205f0470f4 HDFS-2785. Update webhdfs and httpfs for host-based token support. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240460 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 06:57:40 +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
Aaron Myers 3cc71933e9 HDFS-2890. DFSUtil#getSuffixIDs should skip unset configurations. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240447 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 03:00:17 +00:00
Todd Lipcon 11df1c2561 HDFS-2874. Edit log should log to shared dirs before local dirs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240445 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 02:52:53 +00:00
Aaron Myers 447e81f51a HDFS-2889. getNumCurrentReplicas is package private but should be public on0.23 (see HDFS-2408). Contributed by Gregory Chanan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240412 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 00:01:06 +00:00
Aaron Myers 969318cfc2 HDFS-2863. Failures observed if dfs.edits.dir and shared.edits.dir have same directories. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240267 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 18:04:21 +00:00
Tsz-wo Sze 38ad4b5036 HDFS-2879. Change FSDataset to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240020 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:26:02 +00:00
Eli Collins d2b5531b0f HDFS-2769. HA: When HA is enabled with a shared edits dir, that dir should be marked required. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239988 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 03:10:57 +00:00
Aaron Myers 05ab55b705 HDFS-2860. TestDFSRollback#testRollback is failing. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239968 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 01:09:05 +00:00
Todd Lipcon 32c313d51c HDFS-2861. checkpointing should verify that the dfs.http.address has been configured to a non-loopback for peer NN. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239886 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 22:21:57 +00:00
Todd Lipcon 6d5510dfb8 HDFS-2877. If locking of a storage dir fails, it will remove the other NN's lock file on exit. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239880 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 22:12:02 +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
Jitendra Nath Pandey 9eb8f4d267 HDFS-2784. Update hftp and hdfs for host-based token support. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239763 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:04:40 +00:00
Konstantin Shvachko 191db6a907 HDFS-2718. Optimize OP_ADD in edits loading. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239760 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 18:57:49 +00:00
Jitendra Nath Pandey c909aedbc1 HDFS-2814 NamenodeMXBean does not account for svn revision in the version information. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239464 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 05:31:46 +00:00
Todd Lipcon 4d779e088a HDFS-2859. LOCAL_ADDRESS_MATCHER.match has NPE when called from DFSUtil.getSuffixIDs when the host is incorrect. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239356 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 22:02:29 +00:00
Todd Lipcon 048c416beb HDFS-2870. Fix log level for block debug info in processMisReplicatedBlocks. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239278 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 19:23:28 +00:00
Tsz-wo Sze dbbfaebb71 HDFS-2864. Remove some redundant methods and the constant METADATA_VERSION from FSDataset.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238969 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:46:50 +00:00
Eli Collins cf611255d6 HDFS-2742. HA: observed dataloss in replication stress test. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238940 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 05:16:49 +00:00
Aaron Myers 43679fcccd HDFS-2845. SBN should not allow browsing of the file system via web UI. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238897 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 01:29:06 +00:00
Suresh Srinivas 536b30ec91 HDFS-2835. Fix findbugs and javadoc issue with GetConf.java. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238779 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 20:03:49 +00:00
Suresh Srinivas 319021d6fb HDFS-2857. Cleanup BlockInfo class. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238747 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:59:58 +00:00
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