Author: todd
Date: Thu Mar 15 05:35:51 2012
New Revision: 1300813
URL: http://svn.apache.org/viewvc?rev=1300813&view=rev
Log:
HDFS-3093. Fix bug where namenode -format interpreted the -force flag in
reverse. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1300813&r1=1300812&r2=1300813&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Mar 15 05:35:51 2012
@@ -205,6 +205,9 @@ Release 0.23.3 - UNRELEASED
HDFS-2764. TestBackupNode is racy. (atm)
+ HDFS-3093. Fix bug where namenode -format interpreted the -force flag in
+ reverse. (todd)
+
BREAKDOWN OF HDFS-1623 SUBTASKS
HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1300813&r1=1300812&r2=1300813&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Thu Mar 15 05:35:51 2012
@@ -207,7 +207,7 @@ public class NameNode {
/** Format a new filesystem. Destroys any filesystem that may already
* exist at this location. **/
public static void format(Configuration conf) throws IOException {
- format(conf, false);
+ format(conf, true);
}
static NameNodeMetrics metrics;
@@ -644,12 +644,12 @@ public class NameNode {
* for each existing directory and format them.
*
* @param conf
- * @param isConfirmationNeeded
+ * @param force
* @return true if formatting was aborted, false otherwise
* @throws IOException
*/
private static boolean format(Configuration conf,
- boolean isConfirmationNeeded)
+ boolean force)
throws IOException {
String nsId = DFSUtil.getNamenodeNameServiceId(conf);
String namenodeId = HAUtil.getNameNodeId(conf, nsId);
@@ -659,7 +659,7 @@ public class NameNode {
Collection<URI> dirsToFormat = FSNamesystem.getNamespaceDirs(conf);
List<URI> editDirsToFormat =
FSNamesystem.getNamespaceEditsDirs(conf);
- if (!confirmFormat(dirsToFormat, isConfirmationNeeded, true)) {
+ if (!confirmFormat(dirsToFormat, force, true)) {
return true; // aborted
}
@@ -868,7 +868,7 @@ public class NameNode {
switch (startOpt) {
case FORMAT:
- boolean aborted = format(conf, true);
+ boolean aborted = format(conf, false);
System.exit(aborted ? 1 : 0);
return null; // avoid javac warning
case GENCLUSTERID:
