big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-10457. DataNode should not auto-format block pool directory if VERSION is missing. (Wei-Chiu Chuang via lei)

Browse Source
This commit is contained in:
Lei Xu 2016-08-08 15:54:12 -07:00
parent 85422bb7c5
commit cc48251bfd
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
View File

@ -151,7 +151,7 @@ private StorageDirectory loadStorageDirectory(NamespaceInfo nsInfo,
throws IOException { throws IOException {
StorageDirectory sd = new StorageDirectory(dataDir, null, true); StorageDirectory sd = new StorageDirectory(dataDir, null, true);
try { try {
StorageState curState = sd.analyzeStorage(startOpt, this); StorageState curState = sd.analyzeStorage(startOpt, this, true);
// sd is locked but not opened // sd is locked but not opened
switch (curState) { switch (curState) {
case NORMAL: case NORMAL:

20
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
View File

@ -43,6 +43,7 @@
import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager;
import org.apache.hadoop.hdfs.server.common.Storage;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi; import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.hdfs.server.protocol.VolumeFailureSummary; import org.apache.hadoop.hdfs.server.protocol.VolumeFailureSummary;
@ -480,6 +481,25 @@ public void testAutoFormatEmptyDirectory() throws Exception {
checkFailuresAtNameNode(dm, dns.get(0), false, dn1Vol1.getAbsolutePath()); checkFailuresAtNameNode(dm, dns.get(0), false, dn1Vol1.getAbsolutePath());
} }
@Test
public void testAutoFormatEmptyBlockPoolDirectory() throws Exception {
// remove the version file
DataNode dn = cluster.getDataNodes().get(0);
String bpid = cluster.getNamesystem().getBlockPoolId();
BlockPoolSliceStorage bps = dn.getStorage().getBPStorage(bpid);
Storage.StorageDirectory dir = bps.getStorageDir(0);
File current = dir.getCurrentDir();
File currentVersion = new File(current, "VERSION");
currentVersion.delete();
// restart the data node
assertTrue(cluster.restartDataNodes(true));
// the DN should tolerate one volume failure.
cluster.waitActive();
assertFalse("DataNode should not reformat if VERSION is missing",
currentVersion.exists());
}
/** /**
* Checks the NameNode for correct values of aggregate counters tracking failed * Checks the NameNode for correct values of aggregate counters tracking failed
* volumes across all DataNodes. * volumes across all DataNodes.