HDFS-6499. Use NativeIO#renameTo instead of File#renameTo in FileJournalManager. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602543 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
018793faa7
commit
8b1abad185
|
@ -183,6 +183,9 @@ Release 2.5.0 - UNRELEASED
|
|||
HDFS-6529. Trace logging for RemoteBlockReader2 to identify remote datanode
|
||||
and file being read. (Anubhav Dhoot via atm)
|
||||
|
||||
HDFS-6499. Use NativeIO#renameTo instead of File#renameTo in
|
||||
FileJournalManager. (Yongjun Zhang via atm)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
|
||||
|
|
|
@ -42,6 +42,7 @@ import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
|
|||
import org.apache.hadoop.hdfs.server.namenode.NNStorageRetentionManager.StoragePurger;
|
||||
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
|
||||
import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
|
||||
import org.apache.hadoop.io.nativeio.NativeIO;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.base.Joiner;
|
||||
|
@ -132,10 +133,14 @@ public class FileJournalManager implements JournalManager {
|
|||
Preconditions.checkState(!dstFile.exists(),
|
||||
"Can't finalize edits file " + inprogressFile + " since finalized file " +
|
||||
"already exists");
|
||||
if (!inprogressFile.renameTo(dstFile)) {
|
||||
|
||||
try {
|
||||
NativeIO.renameTo(inprogressFile, dstFile);
|
||||
} catch (IOException e) {
|
||||
errorReporter.reportErrorOnFile(dstFile);
|
||||
throw new IllegalStateException("Unable to finalize edits file " + inprogressFile);
|
||||
throw new IllegalStateException("Unable to finalize edits file " + inprogressFile, e);
|
||||
}
|
||||
|
||||
if (inprogressFile.equals(currentInProgress)) {
|
||||
currentInProgress = null;
|
||||
}
|
||||
|
@ -513,12 +518,17 @@ public class FileJournalManager implements JournalManager {
|
|||
File src = file;
|
||||
File dst = new File(src.getParent(), src.getName() + newSuffix);
|
||||
// renameTo fails on Windows if the destination file already exists.
|
||||
if (!src.renameTo(dst)) {
|
||||
if (!dst.delete() || !src.renameTo(dst)) {
|
||||
throw new IOException(
|
||||
"Couldn't rename log " + src + " to " + dst);
|
||||
try {
|
||||
if (dst.exists()) {
|
||||
if (!dst.delete()) {
|
||||
throw new IOException("Couldn't delete " + dst);
|
||||
}
|
||||
}
|
||||
NativeIO.renameTo(src, dst);
|
||||
} catch (IOException e) {
|
||||
throw new IOException(
|
||||
"Couldn't rename log " + src + " to " + dst, e);
|
||||
}
|
||||
file = dst;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue