HADOOP-9490. LocalFileSystem#reportChecksumFailure not closing the checksum file handle before rename. Contributed by Ivan Mitic.

Suresh Srinivas · Suresh Srinivas · commit ee4a0ed068f6 · 2013-04-27T16:10:31.000Z
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476609 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -525,6 +525,9 @@ Trunk (Unreleased)
 
     HADOOP-9500. TestUserGroupInformation#testGetServerSideGroups fails on 
     Windows due to failure to find winutils.exe. (Chris Nauroth via suresh)
+
+    HADOOP-9490. LocalFileSystem#reportChecksumFailure not closing the 
+    checksum file handle before rename. (Ivan Mitic via suresh)
     
 Release 2.0.5-beta - UNRELEASED
 
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java
@@ -130,6 +130,8 @@ public boolean reportChecksumFailure(Path p, FSDataInputStream in,
       }
       // move checksum file too
       File checkFile = ((RawLocalFileSystem)fs).pathToFile(getChecksumFile(p));
+      // close the stream before rename to release the file handle
+      sums.close();
       b = checkFile.renameTo(new File(badDir, checkFile.getName()+suffix));
       if (!b) {
           LOG.warn("Ignoring failure of renameTo");

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@ public boolean reportChecksumFailure(Path p, FSDataInputStream in,`
`130`	`130`	`}`
`131`	`131`	`// move checksum file too`
`132`	`132`	`File checkFile = ((RawLocalFileSystem)fs).pathToFile(getChecksumFile(p));`
	`133`	`+ // close the stream before rename to release the file handle`
	`134`	`+ sums.close();`
`133`	`135`	`b = checkFile.renameTo(new File(badDir, checkFile.getName()+suffix));`
`134`	`136`	`if (!b) {`
`135`	`137`	`LOG.warn("Ignoring failure of renameTo");`