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

HADOOP-9490. Merge r1476609 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486179 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-05-24 19:24:25 +00:00
parent fe81cd68c8
commit e0c878b493
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -339,6 +339,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9500. TestUserGroupInformation#testGetServerSideGroups fails on HADOOP-9500. TestUserGroupInformation#testGetServerSideGroups fails on
Windows due to failure to find winutils.exe. (Chris Nauroth via suresh) 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.4-beta - UNRELEASED Release 2.0.4-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java
View File

@ -130,6 +130,8 @@ public class LocalFileSystem extends ChecksumFileSystem {
} }
// move checksum file too // move checksum file too
File checkFile = ((RawLocalFileSystem)fs).pathToFile(getChecksumFile(p)); 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)); b = checkFile.renameTo(new File(badDir, checkFile.getName()+suffix));
if (!b) { if (!b) {
LOG.warn("Ignoring failure of renameTo"); LOG.warn("Ignoring failure of renameTo");