You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2012/08/13 23:26:12 UTC
svn commit: r1372627 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Author: todd
Date: Mon Aug 13 21:26:12 2012
New Revision: 1372627
URL: http://svn.apache.org/viewvc?rev=1372627&view=rev
Log:
HDFS-3276. initializeSharedEdits should have a -nonInteractive flag. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1372627&r1=1372626&r2=1372627&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Aug 13 21:26:12 2012
@@ -196,6 +196,8 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3190. Simple refactors in existing NN code to assist
QuorumJournalManager extension. (todd)
+ HDFS-3276. initializeSharedEdits should have a -nonInteractive flag (todd)
+
OPTIMIZATIONS
HDFS-2982. Startup performance suffers when there are many edit log
Modified: hadoop/common/branches/branch-2/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-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1372627&r1=1372626&r2=1372627&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Mon Aug 13 21:26:12 2012
@@ -939,7 +939,10 @@ public class NameNode {
StartupOption.ROLLBACK.getName() + "] | [" +
StartupOption.FINALIZE.getName() + "] | [" +
StartupOption.IMPORT.getName() + "] | [" +
- StartupOption.INITIALIZESHAREDEDITS.getName() + "] | [" +
+ StartupOption.INITIALIZESHAREDEDITS.getName() +
+ " [" + StartupOption.FORCE.getName() + "] [" +
+ StartupOption.NONINTERACTIVE.getName() + "]" +
+ "] | [" +
StartupOption.BOOTSTRAPSTANDBY.getName() + "] | [" +
StartupOption.RECOVER.getName() + " [ " +
StartupOption.FORCE.getName() + " ] ]");
@@ -1009,6 +1012,16 @@ public class NameNode {
return startOpt;
} else if (StartupOption.INITIALIZESHAREDEDITS.getName().equalsIgnoreCase(cmd)) {
startOpt = StartupOption.INITIALIZESHAREDEDITS;
+ for (i = i + 1 ; i < argsLen; i++) {
+ if (StartupOption.NONINTERACTIVE.getName().equals(args[i])) {
+ startOpt.setInteractiveFormat(false);
+ } else if (StartupOption.FORCE.getName().equals(args[i])) {
+ startOpt.setForceFormat(true);
+ } else {
+ LOG.fatal("Invalid argument: " + args[i]);
+ return null;
+ }
+ }
return startOpt;
} else if (StartupOption.RECOVER.getName().equalsIgnoreCase(cmd)) {
if (startOpt != StartupOption.REGULAR) {
@@ -1118,7 +1131,9 @@ public class NameNode {
return null; // avoid warning
}
case INITIALIZESHAREDEDITS: {
- boolean aborted = initializeSharedEdits(conf, false, true);
+ boolean aborted = initializeSharedEdits(conf,
+ startOpt.getForceFormat(),
+ startOpt.getInteractiveFormat());
terminate(aborted ? 1 : 0);
return null; // avoid warning
}