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

HDFS-11476. Fix NPE in FsDatasetImpl#checkAndUpdate. Contributed by Xiaobing Zhou.

Browse Source
This commit is contained in:
Jing Zhao 2017-03-03 13:31:20 -08:00
parent 2148b83993
commit ac5ae0065a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2282,12 +2282,14 @@ public void checkAndUpdate(String bpid, long blockId, File diskFile,
if (memBlockInfo.getGenerationStamp() != diskGS) { if (memBlockInfo.getGenerationStamp() != diskGS) {
File memMetaFile = FsDatasetUtil.getMetaFile(diskFile, File memMetaFile = FsDatasetUtil.getMetaFile(diskFile,
memBlockInfo.getGenerationStamp()); memBlockInfo.getGenerationStamp());
if (memMetaFile.exists()) { if (fileIoProvider.exists(vol, memMetaFile)) {
if (memMetaFile.compareTo(diskMetaFile) != 0) { String warningPrefix = "Metadata file in memory "
LOG.warn("Metadata file in memory " + memMetaFile.getAbsolutePath()
+ memMetaFile.getAbsolutePath() + " does not match file found by scan ";
+ " does not match file found by scan " if (!diskMetaFileExists) {
+ (diskMetaFile == null? null: diskMetaFile.getAbsolutePath())); LOG.warn(warningPrefix + "null");
} else if (memMetaFile.compareTo(diskMetaFile) != 0) {
LOG.warn(warningPrefix + diskMetaFile.getAbsolutePath());
} }
} else { } else {
// Metadata file corresponding to block in memory is missing // Metadata file corresponding to block in memory is missing