Commit Graph

687 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Tsz-wo Sze
e561cb9e78 HDFS-3176. Use MD5MD5CRC32FileChecksum.readFields() in JsonUtil . Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309114 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:44:53 +00:00
Tsz-wo Sze
0db8003e2e HDFS-3166. Add timeout to Hftp connections. Contributed by Daryn Sharp
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309103 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:26:57 +00:00
Suresh Srinivas
e449de0526 HDFS-3126. Journal stream from Namenode to BackupNode needs to have timeout. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308636 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 00:55:08 +00:00
Eli Collins
4f15b9dfed HDFS-3148. The client should be able to use multiple local interfaces for data transfer. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308617 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 23:20:34 +00:00
Eli Collins
72b3f302dc HDFS-3148. The client should be able to use multiple local interfaces for data transfer. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308614 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 23:13:06 +00:00
Tsz-wo Sze
bc13dfb142 HDFS-3130. Move fsdataset implementation to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308437 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 17:38:56 +00:00
Eli Collins
be8a0d1e62 HDFS-3174. Fix assert in TestPendingDataNodeMessages. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308226 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 01:45:11 +00:00
Eli Collins
be7dd8333a HDFS-3144. Refactor DatanodeID#getName by use. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308205 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 22:12:12 +00:00
Eli Collins
43afa4ee51 HDFS-2995. start-dfs.sh should only start the 2NN for namenodes with dfs.namenode.secondary.http-address configured. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308174 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 18:41:58 +00:00
Aaron Myers
a232d5c791 HDFS-3167. CLI-based driver for MiniDFSCluster. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308159 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 17:27:54 +00:00
Eli Collins
0663dbaac0 HDFS-3171. The DatanodeID "name" field is overloaded. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308014 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 03:41:41 +00:00
Eli Collins
8bd825bb6f HDFS-3164. Move DatanodeInfo#hostName to DatanodeID. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307890 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 19:58:51 +00:00
Eli Collins
eeb687daa7 HDFS-3172. dfs.upgrade.permission is dead code. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307888 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 19:56:23 +00:00
Aaron Myers
ff897e75c9 HDFS-3070. HDFS balancer doesn't ensure that hdfs-site.xml is loaded. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307841 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 16:20:54 +00:00
Eli Collins
a8cbf19548 HDFS-3138. Move DatanodeInfo#ipcPort to DatanodeID. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307553 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 17:50:05 +00:00
Eli Collins
64641c28b5 HDFS-3137. Bump LAST_UPGRADABLE_LAYOUT_VERSION to -16. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307173 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 00:11:14 +00:00
Aaron Myers
51908783be HDFS-3142. TestHDFSCLI.testAll is failing. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307134 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 22:00:39 +00:00
Eli Collins
da58921cf5 HDFS-3066. Cap space usage of default log4j rolling policy. Contributed by Patrick Hunt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307100 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 20:51:29 +00:00
Aaron Myers
17d22e6dc4 HDFS-3158. LiveNodes member of NameNodeMXBean should list non-DFS used space and capacity per DN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306635 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 22:59:52 +00:00
Tsz-wo Sze
99a68a1423 HDFS-3155. Clean up FSDataset implemenation related code.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306582 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 20:37:34 +00:00
Eli Collins
0475795066 HDFS-3139. Minor Datanode logging improvement. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306549 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 19:33:22 +00:00
Aaron Myers
aa8cb2287f HDFS-3143. TestGetBlocks.testGetBlocks is failing. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306542 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 19:02:16 +00:00
Aaron Myers
1427468a72 HDFS-3156. TestDFSHAAdmin is failing post HADOOP-8202. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306517 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 17:58:23 +00:00
Arun Murthy
67a74198b1 Changed version in trunk to 3.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306200 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:37:06 +00:00
Suresh Srinivas
940dac52a7 HDFS-3125. Add JournalService to enable Journal Daemon. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305726 13f79535-47bb-0310-9956-ffa450edef68
2012-03-27 04:02:03 +00:00
Aaron Myers
466908e67b HDFS-3131. Improve TestStorageRestore. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305688 13f79535-47bb-0310-9956-ffa450edef68
2012-03-27 00:13:42 +00:00
Tsz-wo Sze
525ceb99ad HDFS-2413. Add an API DistributedFileSystem.isInSafeMode() and change DistributedFileSystem to @InterfaceAudience.LimitedPrivate. Contributed by harsh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305632 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:18:04 +00:00
Eli Collins
99a321419f HDFS-3129. NetworkTopology: add test that getLeaf should check for invalid topologies. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305628 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:07:30 +00:00
Tsz-wo Sze
67bdbd60cd (recommit) HDFS-3089. Move FSDatasetInterface and the related classes to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305603 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:14:12 +00:00
Tsz-wo Sze
5e38a9acea Revert 1305590 for HDFS-3089.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305598 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:09:14 +00:00
Tsz-wo Sze
1ebcc378af HDFS-3089. Move FSDatasetInterface and the related classes to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305590 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:01:47 +00:00
Aaron Myers
ce1a7ec975 HDFS-2941. Add an administrative command to download a copy of the fsimage from the NN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305447 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 17:02:40 +00:00
Todd Lipcon
840df19cee HADOOP-8193. Refactor FailoverController/HAAdmin code to add an abstract class for "target" services. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305195 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 01:54:14 +00:00
Todd Lipcon
39775dca68 Revert HADOOP-8193 from r1304967. Patch introduced some NPEs in a test case.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305152 13f79535-47bb-0310-9956-ffa450edef68
2012-03-25 21:38:31 +00:00
Aaron Myers
ea868d3d8b HDFS-3116. Typo in fetchdt error message. Contributed by AOE Takashi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1304996 13f79535-47bb-0310-9956-ffa450edef68
2012-03-25 08:45:04 +00:00
Todd Lipcon
90ea037d21 HADOOP-8193. Refactor FailoverController/HAAdmin code to add an abstract class for "target" services. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1304967 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 23:48:07 +00:00
Todd Lipcon
4cb809bf04 HDFS-3132. Fix findbugs warning on HDFS trunk. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1304681 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 00:21:52 +00:00
Todd Lipcon
b795c65f49 HDFS-3071. haadmin failover command does not provide enough detail when target NN is not ready to be active. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1304203 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 06:29:40 +00:00
Eli Collins
4feef86372 HDFS-3044. fsck move should be non-destructive by default. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1304063 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 21:11:18 +00:00
Tsz-wo Sze
0c4acdc176 HDFS-3100. In BlockSender, throw an exception when it needs to verify checksum but the meta data does not exist. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1303628 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 00:10:20 +00:00
Todd Lipcon
2f820dde17 HDFS-309. FSEditLog should log progress during replay. Contributed by Sho Shimauchi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1303485 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 18:14:09 +00:00
Todd Lipcon
f55a1c0876 HDFS-2834. Add a ByteBuffer-based read API to DFSInputStream. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1303474 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 17:30:37 +00:00
Tsz-wo Sze
9e108e61fb HDFS-3086. Change Datanode not to send storage list in registration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1303318 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 09:07:33 +00:00
Aaron Myers
4ceca97606 HDFS-3083. Cannot run an MR job with HA and security enabled when second-listed NN active. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1303098 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 19:00:56 +00:00
Aaron Myers
21426e6e42 HADOOP-8121. Active Directory Group Mapping Service. Contributed by Jonathan Natkins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1302740 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 01:00:14 +00:00
Tsz-wo Sze
6326605acb HDFS-3105. Add DatanodeStorage information to block recovery.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1302683 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 22:09:14 +00:00
Uma Maheswara Rao G
f77b1a63ec HDFS-3091. Update the usage limitations of ReplaceDatanodeOnFailure policy in the config description for the smaller clusters. Contributed by Nicholas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1302624 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 19:54:13 +00:00
Uma Maheswara Rao G
875080ce10 HDFS-3111. Missing license headers in trunk. Deleted this file from svn repositiry as this file was already empty. (Contributed by Uma MAheswara Rao G).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301876 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 07:06:42 +00:00
Uma Maheswara Rao G
3573d504e4 HDFS-3111. Missing license headers in trunk. (Contributed by Uma Maheswara Rao G).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301871 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 06:50:36 +00:00
Tsz-wo Sze
2a0024403a HDFS-3104. Add tests for HADOOP-8175. Contributed by Daryn Sharp
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301665 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 17:48:33 +00:00
Tsz-wo Sze
662b1887af HDFS-3088. Move FSDatasetInterface inner classes to a package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301661 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 17:32:57 +00:00
Tsz-wo Sze
9b2a324ba5 HDFS-3098. Update and add tests for HADOOP-8173. Contributed by Daryn Sharp
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301295 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 00:27:40 +00:00
Tsz-wo Sze
7e5b60116e HDFS-3101. Cannot read empty file using WebHDFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301287 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 00:01:23 +00:00
Todd Lipcon
49619e8997 HDFS-3062. Fix bug which prevented MR job submission from creating delegation tokens on an HA cluster. Contributed by Mingjie Lai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301285 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 00:00:29 +00:00
Aaron Myers
65425b0961 HDFS-3099. SecondaryNameNode does not properly initialize metrics system. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301222 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 21:51:23 +00:00
Aaron Myers
6d96a28a08 HDFS-3067. NPE in DFSInputStream.readBuffer if read is repeated on corrupted block. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301182 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 20:26:29 +00:00
Tsz-wo Sze
1177d4edc2 HDFS-3005. FSVolume.decDfsUsed(..) should be synchronized.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1301127 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 18:24:40 +00:00
Todd Lipcon
59eb544744 HDFS-3093. Fix bug where namenode -format interpreted the -force flag in reverse. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1300814 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 05:36:03 +00:00
Tsz-wo Sze
3e582c690c HDFS-3082. Clean up FSDatasetInterface and change DataNode.data to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1300392 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 22:52:17 +00:00
Eli Collins
ab20dae519 HDFS-2303. Unbundle jsvc. Contributed by Roman Shaposhnik and Mingjie Lai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299963 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 03:38:57 +00:00
Todd Lipcon
1a75ec8288 HDFS-2731. Add command to bootstrap the Standby Node's name directories from the Active NameNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299807 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 19:41:21 +00:00
Tsz-wo Sze
c8f2889bde HDFS-3056: add the new file for the previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299144 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 01:58:29 +00:00
Tsz-wo Sze
501a283986 HDFS-3056. Add a new interface RollingLogs for DataBlockScanner logging.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299139 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 01:52:17 +00:00
Steve Loughran
381a9b2d58 HDFS-2966
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298820 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 13:17:04 +00:00
Uma Maheswara Rao G
069fb57f4e HDFS-2976 removed the unused imports that were missed in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298508 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 18:56:43 +00:00
Uma Maheswara Rao G
6c0c140350 HDFS-2976 corrected the previous wrong commit for this issue.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298507 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 18:51:46 +00:00
Uma Maheswara Rao G
b19d1186ab HDFS-2976. Remove unnecessary method (tokenRefetchNeeded) in DFSClient.
(Contributed by Uma Maheswara Rao G)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298495 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 18:31:33 +00:00
Tsz-wo Sze
22738ae1d0 HDFS-2038. Update TestHDFSCLI to handle relative paths with globs. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298066 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 19:44:47 +00:00
Eli Collins
0a2b413dff HDFS-3060. Bump TestDistributedUpgrade#testDistributedUpgrade timeout. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298044 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 19:16:03 +00:00
Tsz-wo Sze
0ee71adeb4 HDFS-3032. Change DFSClient.renewLease() so that it only retries up to the lease soft-limit. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1297328 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 02:42:46 +00:00
Todd Lipcon
87d1c67944 Merge trunk into HA branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296025 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 01:48:32 +00:00
Aaron Myers
7be4e5bd22 HDFS-3039. Address findbugs and javadoc warnings on branch. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296017 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 01:32:49 +00:00
Aaron Myers
6da670ce6a HDFS-3037. TestMulitipleNNDataBlockScanner#testBlockScannerAfterRestart is racy. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296016 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 01:26:54 +00:00
Tsz-wo Sze
b2f67b4704 HADOOP-8124, HDFS-3034, MAPREDUCE-3956. Remove the deprecated Syncable.sync().
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295999 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 23:51:19 +00:00
Aaron Myers
f22677ef8e HDFS-3036. Remove unused method DFSUtil#isDefaultNamenodeAddress. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295961 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 22:52:05 +00:00
Tsz-wo Sze
9e31bf675d HDFS-3021. Use generic type to declare FSDatasetInterface.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295929 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 21:58:39 +00:00
Todd Lipcon
55832c6c96 HDFS-3035. Fix failure of TestFileAppendRestart due to OP_UPDATE_BLOCKS. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295740 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 18:57:58 +00:00
Todd Lipcon
6e5e1e54bc Amend HDFS-3023. Add new layout version number to ImageLoaderCurrent to fix TestOfflineImageViewer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295721 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 18:23:19 +00:00
Aaron Myers
0d7de507a5 HDFS-2979. Balancer should use logical uri for creating failover proxy with HA enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295473 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 08:50:10 +00:00
Aaron Myers
9318ff4250 Revert commit of HDFS-2979.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295435 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 07:03:40 +00:00
Todd Lipcon
30cffeb388 HDFS-3023. Optimize entries in edits log for persistBlocks call. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295356 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 00:37:09 +00:00
Todd Lipcon
1ba357553a Merge trunk into HA branch.
Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk.
Resolved some conflicts around removal of VersionedProtocol, etc.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295342 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 23:47:49 +00:00
Aaron Myers
01b17c40cf HDFS-2979. Balancer should use logical uri for creating failover proxy with HA enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295340 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 23:42:52 +00:00
Aaron Myers
7b6b204924 HDFS-3027. Implement a simple NN health check. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295300 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 21:57:56 +00:00
Todd Lipcon
28de3628f5 HDFS-3020. Fix editlog to automatically sync when buffer is full. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295239 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 19:57:18 +00:00
Jitendra Nath Pandey
ca9b4de772 HDFS-3012. Exception while renewing delegation token. Contributed by Bobby Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295232 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 19:36:17 +00:00
Eli Collins
fbf3a9ee3d HDFS-2992. Edit log failure trace should include transaction ID of error. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295227 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 19:31:36 +00:00
Todd Lipcon
34c73db5e1 HDFS-2991. Fix case where OP_ADD would not be logged in append(). Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295214 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 18:52:00 +00:00
Jitendra Nath Pandey
e57fd85fd4 HDFS-3030. Remove getProtocolVersion and getProtocolSignature from translators.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295017 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 08:52:45 +00:00
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
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
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
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
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