Commit Graph

691 Commits

Author SHA1 Message Date
Todd Lipcon 6f2aae046d Resolve trivial compilation error after previous merge
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1324570 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:52:31 +00:00
Todd Lipcon 2bf19979b3 Merge trunk into auto-failover branch.
Needs a few tweaks to fix compilation - will do in followup commit. This is just a straight merge


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1324567 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:47:40 +00:00
Todd Lipcon 41a014c31b HADOOP-8247. Add a config to enable auto-HA, which disables manual FailoverController. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1324566 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:40:26 +00:00
Todd Lipcon dab66bee55 HDFS-3249. Use ToolRunner.confirmPrompt in NameNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1324564 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:28:58 +00:00
Todd Lipcon 21824d8232 HDFS-3247. Improve bootstrapStandby behavior when original NN is not active. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1324558 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:16:06 +00:00
Eli Collins e235dd3760 HDFS-2696. Fix the fuse-fds build. Contributed by Bruno Mahé
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1312068 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:55:05 +00:00
Eli Collins 80447bd35a HDFS-3244. Remove dead writable code from hdfs/protocol. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1312061 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:10:38 +00:00
Todd Lipcon 58228e4e7b HDFS-3243. TestParallelRead timing out on jenkins. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1312029 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:31:18 +00:00
Todd Lipcon 7c2e10e0cd HDFS-3248. bootstrapStandby repeated twice in hdfs namenode usage message. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1312028 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:28:25 +00:00
Todd Lipcon 3ffdb9152e HDFS-3094. add -nonInteractive and -force option to namenode -format command. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1312025 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:22:38 +00:00
Eli Collins 926f0a5ae0 HDFS-3238. ServerCommand and friends don't need to be writables. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311774 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 15:03:17 +00:00
Todd Lipcon df3e1a3158 HDFS-3240. Drop log level of "heartbeat: ..." in BPServiceActor to DEBUG. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311577 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 05:12:00 +00:00
Aaron Myers 53dc8546d4 HDFS-3235. MiniDFSClusterManager doesn't correctly support -format option. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311556 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 02:25:40 +00:00
Aaron Myers 9597c81f35 HDFS-3236. NameNode does not initialize generic conf keys when started with -initializeSharedEditsDir. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311554 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 02:17:17 +00:00
Todd Lipcon 91528ce9ed HDFS-3234. Accidentally left log message in GetConf after HDFS-3226. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311541 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:59:38 +00:00
Eli Collins 706394d039 HDFS-3004. Implement Recovery Mode. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311394 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:39:58 +00:00
Uma Maheswara Rao G 3ced5ea066 HDFS-3119. Overreplicated block is not deleted even after the replication factor is reduced after sync follwed by closing that file. Contributed by Ashish Singhi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311380 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:11:58 +00:00
Aaron Myers 909176c1fc HADOOP-8261. Har file system doesn't deal with FS URIs with a host but no port. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311133 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 05:56:22 +00:00
Todd Lipcon ee5daee1b7 HDFS-3214. InterDatanodeProtocolServerSideTranslatorPB doesn't handle null response from initReplicaRecovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311125 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 03:22:41 +00:00
Todd Lipcon 693ec453d2 HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310919 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 23:24:57 +00:00
Todd Lipcon ca6f0940fd Merge trunk into auto-failover branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310905 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 22:53:55 +00:00
Tsz-wo Sze 74b4b45651 HDFS-3211. Add fence(..) and replace NamenodeRegistration with JournalInfo and epoch in JournalProtocol. Contributed by suresh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310649 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 00:52:12 +00:00
Todd Lipcon 2ab67dce11 HDFS-3226. Allow GetConf tool to print arbitrary keys. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310648 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 00:15:30 +00:00
Suresh Srinivas 02f5e43686 HDFS-3121. Add HDFS tests for HADOOP-8014 change. Contributed by John George. Missed adding the file in the earlier commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310631 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 23:03:54 +00:00
Suresh Srinivas de3fb5c23a HDFS-3121. Add HDFS tests for HADOOP-8014 change. Contributed by John George.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310630 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 23:03:00 +00:00
Todd Lipcon 97804bacd0 HDFS-3223. add zkfc to hadoop-daemon.sh script. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310620 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 22:27:28 +00:00
Tsz-wo Sze 58e920d1a0 HDFS-2505. Add a test to verify getFileChecksum(..) with ViewFS. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310522 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:04:05 +00:00
Suresh Srinivas b3ac25048c HDFS-3136. Remove SLF4J dependency as HDFS does not need it to fix unnecessary warnings. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310476 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:50:31 +00:00
Todd Lipcon d166bd184d HDFS-3110. Use directRead API to reduce the number of buffer copies in libhdfs. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310185 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 06:31:10 +00:00
Todd Lipcon 30068a1d83 Merge trunk into auto-failover branch.
Addressed two semantic conflicts after the commit of HADOOP-8077 -- test code was referencing the old constant for the fencing methods config key.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310174 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 05:07:33 +00:00
Todd Lipcon d483b6f3fc HADOOP-8077. HA: fencing method should be able to be configured on a per-NN or per-NS basis. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310173 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 04:56:26 +00:00
Todd Lipcon 844faefd08 HDFS-3200. Scope all ZKFC configurations by nameservice. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310165 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 04:27:44 +00:00
Eli Collins e505b7e704 HDFS-3208. Bogus entries in hosts files are incorrectly displayed in the report. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310138 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 00:20:55 +00:00
Eli Collins 112c324151 HDFS-3210. JsonUtil#toJsonMap for for a DatanodeInfo should use "ipAddr" instead of "name". Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310135 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 00:10:54 +00:00
Suresh Srinivas 861c872541 HDFS-3204. Minor modification to JournalProtocol.proto to make it generic. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310134 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 00:08:19 +00:00
Tsz-wo Sze 80bbefafaf HDFS-3178. Add states and state handler for journal synchronization in JournalService.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310115 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 22:35:53 +00:00
Suresh Srinivas 4c908d0987 HDFS-3109. Remove hsqldf exclusions from pom.xml. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309971 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 17:42:46 +00:00
Aaron Myers 8e739ff01e HDFS-3202. NamespaceInfo PB translation drops build version. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309955 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 17:18:26 +00:00
Eli Collins 663fbd46a8 HDFS-3199. TestValidateConfigurationSettings is failing. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309641 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 03:31:03 +00:00
Eli Collins 4f6e0a5a65 HDFS-3050. rework OEV to share more code with the NameNode. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309629 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 00:02:11 +00:00
Aaron Myers ba688e11c1 HDFS-3102. Add CLI tool to initialize the shared-edits dir. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309580 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:15:08 +00:00
Todd Lipcon 00a1548005 Merge trunk into auto-HA branch
Resolved some trivial conflicts in NNHAServiceTarget


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1309576 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:00:15 +00:00
Todd Lipcon b74d742785 HADOOP-8245. Fix flakiness in TestZKFailoverController. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1309554 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 19:21:01 +00:00
Todd Lipcon a7d6bdc63b HDFS-3084. FenceMethod.tryFence() and ShellCommandFencer should pass namenodeId as well as host:port. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309526 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 18:40:43 +00:00
Eli Collins 4f7f58fa8b Updated CHANGES.txt to reflect HDFS-2564 merge
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309488 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 16:40:08 +00:00
Aaron Myers 7525ee5b67 HDFS-3000. Add a public API for setting quotas. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 03:18:49 +00:00
Tsz-wo Sze 8c0366bf10 HDFS-3168. Remove unnecessary "throw IOException" and change fields to final in FSNamesystem and BlockManager.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309218 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 02:51:34 +00:00
Todd Lipcon 30e1b3bba8 HADOOP-8215. Security support for ZK Failover controller. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1309185 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 23:37:15 +00:00
Todd Lipcon 9972a9633d HDFS-3187. Upgrade guava to 11.0.2. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309181 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 22:30:29 +00:00
Todd Lipcon 39a5fd5c71 Merge trunk into auto-failover branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1309164 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 21:48:23 +00:00