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

HDFS-16180.FsVolumeImpl.nextBlock should consider that the block meta file has been deleted. (#3315)

Browse Source
This commit is contained in:
Neil 2021-08-24 11:15:47 +08:00 committed by GitHub
parent b6d1971820
commit 9084c728eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetUtil.java
View File

@ -21,6 +21,7 @@
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.File; import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.FileNotFoundException;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -98,7 +99,8 @@ public boolean accept(File dir, String name) {
}); });
if (matches == null || matches.length == 0) { if (matches == null || matches.length == 0) {
throw new IOException("Meta file not found, blockFile=" + blockFile); throw new FileNotFoundException(
"Meta file not found, blockFile=" + blockFile);
} }
if (matches.length > 1) { if (matches.length > 1) {
throw new IOException("Found more than one meta files: " throw new IOException("Found more than one meta files: "

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java
View File

@ -20,6 +20,7 @@
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -865,7 +866,15 @@ public ExtendedBlock nextBlock() throws IOException {
} }
File blkFile = getBlockFile(bpid, block); File blkFile = getBlockFile(bpid, block);
File metaFile = FsDatasetUtil.findMetaFile(blkFile); File metaFile ;
try {
metaFile = FsDatasetUtil.findMetaFile(blkFile);
} catch (FileNotFoundException e){
LOG.warn("nextBlock({}, {}): {}", storageID, bpid,
e.getMessage());
continue;
}
block.setGenerationStamp( block.setGenerationStamp(
Block.getGenerationStamp(metaFile.getName())); Block.getGenerationStamp(metaFile.getName()));
block.setNumBytes(blkFile.length()); block.setNumBytes(blkFile.length());