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 su...@apache.org on 2011/05/19 20:11:50 UTC
svn commit: r1125031 - in /hadoop/hdfs/trunk: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java
src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Author: suresh
Date: Thu May 19 18:11:50 2011
New Revision: 1125031
URL: http://svn.apache.org/viewvc?rev=1125031&view=rev
Log:
HDFS-1941. Remove -genclusterid option from namenode command. Contributed by Bharath Mundlapudi.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1125031&r1=1125030&r2=1125031&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu May 19 18:11:50 2011
@@ -442,6 +442,9 @@ Trunk (unreleased changes)
HDFS-1905. Improve namenode -format command by not making -clusterId
parameter mandatory. (Bharath Mundlapudi via suresh)
+ HDFS-1941. Remove -genclusterid option from namenode command.
+ (Bharath Mundlapudi via suresh)
+
OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java?rev=1125031&r1=1125030&r2=1125031&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java Thu May 19 18:11:50 2011
@@ -42,7 +42,6 @@ public interface HdfsConstants {
static public enum StartupOption{
FORMAT ("-format"),
CLUSTERID ("-clusterid"),
- GENCLUSTERID ("-genclusterid"),
REGULAR ("-regular"),
BACKUP ("-backup"),
CHECKPOINT("-checkpoint"),
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1125031&r1=1125030&r2=1125031&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Thu May 19 18:11:50 2011
@@ -1590,8 +1590,6 @@ public class NameNode implements Namenod
i += 2;
startOpt.setClusterId(args[i]);
}
- } else if (StartupOption.GENCLUSTERID.getName().equalsIgnoreCase(cmd)) {
- startOpt = StartupOption.GENCLUSTERID;
} else if (StartupOption.REGULAR.getName().equalsIgnoreCase(cmd)) {
startOpt = StartupOption.REGULAR;
} else if (StartupOption.BACKUP.getName().equalsIgnoreCase(cmd)) {
@@ -1671,11 +1669,6 @@ public class NameNode implements Namenod
boolean aborted = format(conf, true);
System.exit(aborted ? 1 : 0);
return null; // avoid javac warning
- case GENCLUSTERID:
- System.err.println("Generating new cluster id:");
- System.out.println(NNStorage.newClusterID());
- System.exit(0);
- return null;
case FINALIZE:
aborted = finalize(conf, true);
System.exit(aborted ? 1 : 0);