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