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

HDFS-13246. FileInputStream redundant closes in readReplicasFromCache. Contributed by liaoyuxiangqin.

Browse Source
This commit is contained in:
Xiao Chen 2018-03-14 21:59:26 -07:00
parent 3a0f4bc0d5
commit 5ff22d4c3a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,7 +812,6 @@ private boolean readReplicasFromCache(ReplicaMap volumeMap,
break; break;
} }
} }
inputStream.close();
// Now it is safe to add the replica into volumeMap // Now it is safe to add the replica into volumeMap
// In case of any exception during parsing this cache file, fall back // In case of any exception during parsing this cache file, fall back
// to scan all the files on disk. // to scan all the files on disk.
@ -835,12 +834,13 @@ private boolean readReplicasFromCache(ReplicaMap volumeMap,
return false; return false;
} }
finally { finally {
// close the inputStream
IOUtils.closeStream(inputStream);
if (!fileIoProvider.delete(volume, replicaFile)) { if (!fileIoProvider.delete(volume, replicaFile)) {
LOG.info("Failed to delete replica cache file: " + LOG.info("Failed to delete replica cache file: " +
replicaFile.getPath()); replicaFile.getPath());
} }
// close the inputStream
IOUtils.closeStream(inputStream);
} }
} }