Repository: hadoop Updated Branches: refs/heads/trunk 9803ae374 -> 4cd66f7fb
HDFS-7583. Fix findbug in TransferFsImage.java (Contributed by Vinayakumar B) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4cd66f7f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4cd66f7f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4cd66f7f Branch: refs/heads/trunk Commit: 4cd66f7fb280e53e2d398a62e922a8d68d150679 Parents: 9803ae3 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Tue Jan 6 09:31:35 2015 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Tue Jan 6 09:31:35 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4cd66f7f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 48e3695..e9d6ad2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -642,6 +642,8 @@ Release 2.7.0 - UNRELEASED HDFS-7572. TestLazyPersistFiles#testDnRestartWithSavedReplicas is flaky on Windows. (Arpit Agarwal via cnauroth) + HDFS-7583. Fix findbug in TransferFsImage.java (vinayakumarb) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4cd66f7f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java index 1f52ff7..c1e9d7f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/TransferFsImage.java @@ -574,11 +574,12 @@ public class TransferFsImage { LOG.info("Deleting temporary files: " + files); for (File file : files) { - file.delete(); // ignore the return value + if (!file.delete()) { + LOG.warn("Deleting " + file + " has failed"); + } } } - private static MD5Hash parseMD5Header(HttpURLConnection connection) { String header = connection.getHeaderField(MD5_HEADER); return (header != null) ? new MD5Hash(header) : null;
