Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe) 

(cherry picked from commit b6b95ff667)
This commit is contained in:
Colin Patrick Mccabe 2014-08-27 13:49:31 -07:00
parent fdc15db2e1
commit 01b2c9b15f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -301,6 +301,11 @@ Release 2.6.0 - UNRELEASED
HDFS-6892. Add XDR packaging method for each NFS request (brandonli) HDFS-6892. Add XDR packaging method for each NFS request (brandonli)
HDFS-6938. Cleanup javac warnings in FSNamesystem (Charles Lamb via wheat9)
HDFS-6902. FileWriter should be closed in finally block in
BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe)
Release 2.5.1 - UNRELEASED Release 2.5.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -825,15 +825,17 @@ class BlockReceiver implements Closeable {
LOG.warn("Failed to delete restart meta file: " + LOG.warn("Failed to delete restart meta file: " +
restartMeta.getPath()); restartMeta.getPath());
} }
FileWriter out = null;
try { try {
FileWriter out = new FileWriter(restartMeta); out = new FileWriter(restartMeta);
// write out the current time. // write out the current time.
out.write(Long.toString(Time.now() + restartBudget)); out.write(Long.toString(Time.now() + restartBudget));
out.flush(); out.flush();
out.close();
} catch (IOException ioe) { } catch (IOException ioe) {
// The worst case is not recovering this RBW replica. // The worst case is not recovering this RBW replica.
// Client will fall back to regular pipeline recovery. // Client will fall back to regular pipeline recovery.
} finally {
IOUtils.cleanup(LOG, out);
} }
try { try {
// Even if the connection is closed after the ack packet is // Even if the connection is closed after the ack packet is