HDFS-1969. Running rollback on new-version namenode destroys the namespace. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@1132525 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 972af6d..78d7ea2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1139,6 +1139,9 @@
HDFS-977. DataNode.createInterDataNodeProtocolProxy() guards a log
at the wrong level. (Harsh J Chouraria via todd)
+ HDFS-1969. Running rollback on new-version namenode destroys the
+ namespace. (todd)
+
Release 0.21.1 - Unreleased
HDFS-1466. TestFcHdfsSymlink relies on /tmp/test not existing. (eli)
diff --git a/src/java/org/apache/hadoop/hdfs/server/common/Storage.java b/src/java/org/apache/hadoop/hdfs/server/common/Storage.java
index 257beae..2c8f2c9 100644
--- a/src/java/org/apache/hadoop/hdfs/server/common/Storage.java
+++ b/src/java/org/apache/hadoop/hdfs/server/common/Storage.java
@@ -873,7 +873,7 @@
String property = props.getProperty(name);
if (property == null) {
throw new InconsistentFSStateException(sd.root, "file "
- + STORAGE_FILE_VERSION + " has " + name + " mising.");
+ + STORAGE_FILE_VERSION + " has " + name + " missing.");
}
return property;
}
diff --git a/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
index 3590370..d239761 100644
--- a/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
+++ b/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
@@ -438,6 +438,14 @@
// read and verify consistency of the prev dir
sdPrev.read(sdPrev.getPreviousVersionFile());
+ if (prevState.getLayoutVersion() != FSConstants.LAYOUT_VERSION) {
+ throw new IOException(
+ "Cannot rollback to storage version " +
+ prevState.getLayoutVersion() +
+ " using this version of the NameNode, which uses storage version " +
+ FSConstants.LAYOUT_VERSION + ". " +
+ "Please use the previous version of HDFS to perform the rollback.");
+ }
canRollback = true;
}
if (!canRollback)
@@ -960,6 +968,11 @@
* Save current image and empty journal into {@code current} directory.
*/
protected void saveCurrent(StorageDirectory sd) throws IOException {
+ if (storage.getLayoutVersion() != FSConstants.LAYOUT_VERSION) {
+ throw new IllegalStateException(
+ "NN with storage version " + FSConstants.LAYOUT_VERSION +
+ "cannot save an image with version " + storage.getLayoutVersion());
+ }
File curDir = sd.getCurrentDir();
NameNodeDirType dirType = (NameNodeDirType)sd.getStorageDirType();
// save new image or new edits
diff --git a/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java b/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
index 08682ec..3303c03 100644
--- a/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
+++ b/src/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java
@@ -732,13 +732,17 @@
props.setProperty("distributedUpgradeVersion",
Integer.toString(uVersion));
}
- if (imageDigest == null) {
- imageDigest = MD5Hash.digest(
- new FileInputStream(getStorageFile(sd, NameNodeFile.IMAGE)));
+ if (LayoutVersion.supports(Feature.FSIMAGE_CHECKSUM, layoutVersion)) {
+ // Though the current NN supports this feature, this function
+ // is called with old layoutVersions from the upgrade tests.
+ if (imageDigest == null) {
+ // May be null on the first save after an upgrade.
+ imageDigest = MD5Hash.digest(
+ new FileInputStream(getStorageFile(sd, NameNodeFile.IMAGE)));
+ }
+ props.setProperty(MESSAGE_DIGEST_PROPERTY, imageDigest.toString());
}
- props.setProperty(MESSAGE_DIGEST_PROPERTY, imageDigest.toString());
-
writeCheckpointTime(sd);
}
diff --git a/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRollback.java b/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRollback.java
index f7e4ae1..25ec63a 100644
--- a/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRollback.java
+++ b/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRollback.java
@@ -32,6 +32,7 @@
import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
+import org.apache.hadoop.util.StringUtils;
/**
* This test ensures the appropriate response (successful or failure) from
@@ -89,7 +90,7 @@
* Attempts to start a NameNode with the given operation. Starting
* the NameNode should throw an exception.
*/
- void startNameNodeShouldFail(StartupOption operation) {
+ void startNameNodeShouldFail(StartupOption operation, String searchString) {
try {
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0)
.startupOption(operation)
@@ -99,6 +100,10 @@
.build(); // should fail
throw new AssertionError("NameNode should have failed to start");
} catch (Exception expected) {
+ if (!expected.getMessage().contains(searchString)) {
+ fail("Expected substring '" + searchString + "' in exception " +
+ "but got: " + StringUtils.stringifyException(expected));
+ }
// expected
}
}
@@ -165,7 +170,8 @@
log("NameNode rollback without existing previous dir", numDirs);
UpgradeUtilities.createNameNodeStorageDirs(nameNodeDirs, "current");
- startNameNodeShouldFail(StartupOption.ROLLBACK);
+ startNameNodeShouldFail(StartupOption.ROLLBACK,
+ "None of the storage directories contain previous fs state");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
log("DataNode rollback without existing previous dir", numDirs);
@@ -238,7 +244,8 @@
for (File f : baseDirs) {
FileUtil.fullyDelete(new File(f,"edits"));
}
- startNameNodeShouldFail(StartupOption.ROLLBACK);
+ startNameNodeShouldFail(StartupOption.ROLLBACK,
+ "Edits file is not found");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
log("NameNode rollback with no image file", numDirs);
@@ -247,7 +254,8 @@
for (File f : baseDirs) {
FileUtil.fullyDelete(new File(f,"fsimage"));
}
- startNameNodeShouldFail(StartupOption.ROLLBACK);
+ startNameNodeShouldFail(StartupOption.ROLLBACK,
+ "Image file is not found");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
log("NameNode rollback with corrupt version file", numDirs);
@@ -256,7 +264,8 @@
for (File f : baseDirs) {
UpgradeUtilities.corruptFile(new File(f,"VERSION"));
}
- startNameNodeShouldFail(StartupOption.ROLLBACK);
+ startNameNodeShouldFail(StartupOption.ROLLBACK,
+ "file VERSION has layoutVersion missing");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
log("NameNode rollback with old layout version in previous", numDirs);
@@ -269,7 +278,8 @@
UpgradeUtilities.createNameNodeVersionFile(conf, baseDirs,
storageInfo, UpgradeUtilities.getCurrentBlockPoolID(cluster));
- startNameNodeShouldFail(StartupOption.UPGRADE);
+ startNameNodeShouldFail(StartupOption.ROLLBACK,
+ "Cannot rollback to storage version 1 using this version");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
} // end numDir loop
}
