Author: cnauroth
Date: Thu Jun 26 23:16:12 2014
New Revision: 1605930
URL: http://svn.apache.org/r1605930
Log:
HDFS-6572. Merging change r1605928 from trunk to branch-2.
Added:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
- copied unchanged from r1605928,
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java
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/common/HdfsServerConstants.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
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=1605930&r1=1605929&r2=1605930&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
Thu Jun 26 23:16:12 2014
@@ -225,6 +225,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6595. Allow the maximum threads for balancing on datanodes to be
configurable. (Benoy Antony via szetszwo)
+ HDFS-6572. Add an option to the NameNode that prints the software and
+ on-disk image versions. (Charles Lamb via cnauroth)
+
OPTIMIZATIONS
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.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/common/HdfsServerConstants.java?rev=1605930&r1=1605929&r2=1605930&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
Thu Jun 26 23:16:12 2014
@@ -92,7 +92,8 @@ public final class HdfsServerConstants {
RECOVER ("-recover"),
FORCE("-force"),
NONINTERACTIVE("-nonInteractive"),
- RENAMERESERVED("-renameReserved");
+ RENAMERESERVED("-renameReserved"),
+ METADATAVERSION("-metadataVersion");
private static final Pattern ENUM_WITH_ROLLING_UPGRADE_OPTION =
Pattern.compile(
"(\\w+)\\((\\w+)\\)");
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.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/FSImage.java?rev=1605930&r1=1605929&r2=1605930&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Thu Jun 26 23:16:12 2014
@@ -214,6 +214,13 @@ public class FSImage implements Closeabl
int layoutVersion = storage.getLayoutVersion();
+ if (startOpt == StartupOption.METADATAVERSION) {
+ System.out.println("HDFS Image Version: " + layoutVersion);
+ System.out.println("Software format version: " +
+ HdfsConstants.NAMENODE_LAYOUT_VERSION);
+ return false;
+ }
+
if (layoutVersion < Storage.LAST_PRE_UPGRADE_LAYOUT_VERSION) {
NNStorage.checkVersionUpgradable(storage.getLayoutVersion());
}
@@ -289,6 +296,12 @@ public class FSImage implements Closeabl
storage.dirIterator(); it.hasNext();) {
StorageDirectory sd = it.next();
StorageState curState;
+ if (startOpt == StartupOption.METADATAVERSION) {
+ /* All we need is the layout version. */
+ storage.readProperties(sd);
+ return true;
+ }
+
try {
curState = sd.analyzeStorage(startOpt, storage);
// sd is locked but not opened
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=1605930&r1=1605929&r2=1605930&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
Thu Jun 26 23:16:12 2014
@@ -200,25 +200,28 @@ public class NameNode implements NameNod
};
private static final String USAGE = "Usage: java NameNode ["
- + StartupOption.BACKUP.getName() + "] | ["
- + StartupOption.CHECKPOINT.getName() + "] | ["
+ + StartupOption.BACKUP.getName() + "] | \n\t["
+ + StartupOption.CHECKPOINT.getName() + "] | \n\t["
+ StartupOption.FORMAT.getName() + " ["
+ StartupOption.CLUSTERID.getName() + " cid ] ["
+ StartupOption.FORCE.getName() + "] ["
- + StartupOption.NONINTERACTIVE.getName() + "] ] | ["
+ + StartupOption.NONINTERACTIVE.getName() + "] ] | \n\t["
+ StartupOption.UPGRADE.getName() +
" [" + StartupOption.CLUSTERID.getName() + " cid]" +
- " [" + StartupOption.RENAMERESERVED.getName() + "<k-v pairs>] ] | ["
- + StartupOption.ROLLBACK.getName() + "] | ["
+ " [" + StartupOption.RENAMERESERVED.getName() + "<k-v pairs>] ] |
\n\t["
+ + StartupOption.ROLLBACK.getName() + "] | \n\t["
+ StartupOption.ROLLINGUPGRADE.getName() + " <"
+ RollingUpgradeStartupOption.DOWNGRADE.name().toLowerCase() + "|"
- + RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "> ] | ["
- + StartupOption.FINALIZE.getName() + "] | ["
- + StartupOption.IMPORT.getName() + "] | ["
- + StartupOption.INITIALIZESHAREDEDITS.getName() + "] | ["
- + StartupOption.BOOTSTRAPSTANDBY.getName() + "] | ["
- + StartupOption.RECOVER.getName() + " [ " + StartupOption.FORCE.getName()
- + " ] ]";
+ + RollingUpgradeStartupOption.ROLLBACK.name().toLowerCase() + "> ] |
\n\t["
+ + StartupOption.FINALIZE.getName() + "] | \n\t["
+ + StartupOption.IMPORT.getName() + "] | \n\t["
+ + StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t["
+ + StartupOption.BOOTSTRAPSTANDBY.getName() + "] | \n\t["
+ + StartupOption.RECOVER.getName() + " [ "
+ + StartupOption.FORCE.getName() + "] ] | \n\t["
+ + StartupOption.METADATAVERSION.getName() + " ] "
+ + " ]";
+
public long getProtocolVersion(String protocol,
long clientVersion) throws IOException {
@@ -1265,6 +1268,8 @@ public class NameNode implements NameNod
"can't understand option \"" + args[i] + "\"");
}
}
+ } else if
(StartupOption.METADATAVERSION.getName().equalsIgnoreCase(cmd)) {
+ startOpt = StartupOption.METADATAVERSION;
} else {
return null;
}
@@ -1317,6 +1322,21 @@ public class NameNode implements NameNod
}
}
+ /**
+ * Verify that configured directories exist, then print the metadata versions
+ * of the software and the image.
+ *
+ * @param conf configuration to use
+ * @throws IOException
+ */
+ private static boolean printMetadataVersion(Configuration conf)
+ throws IOException {
+ final FSImage fsImage = new FSImage(conf);
+ final FSNamesystem fs = new FSNamesystem(conf, fsImage, false);
+ return fsImage.recoverTransitionRead(
+ StartupOption.METADATAVERSION, fs, null);
+ }
+
public static NameNode createNameNode(String argv[], Configuration conf)
throws IOException {
LOG.info("createNameNode " + Arrays.asList(argv));
@@ -1377,6 +1397,11 @@ public class NameNode implements NameNod
NameNode.doRecovery(startOpt, conf);
return null;
}
+ case METADATAVERSION: {
+ printMetadataVersion(conf);
+ terminate(0);
+ return null; // avoid javac warning
+ }
default: {
DefaultMetricsSystem.initialize("NameNode");
return new NameNode(conf);
