Author: brandonli
Date: Thu Oct 10 01:09:00 2013
New Revision: 1530837
URL: http://svn.apache.org/r1530837
Log:
HDFS-5337. Merging change r1530836 from branch-2
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java?rev=1530837&r1=1530836&r2=1530837&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
Thu Oct 10 01:09:00 2013
@@ -712,7 +712,8 @@ class OpenFileCtx {
LOG.debug("Got commit status: " + ret.name());
}
// Do the sync outside the lock
- if (ret == COMMIT_STATUS.COMMIT_DO_SYNC) {
+ if (ret == COMMIT_STATUS.COMMIT_DO_SYNC
+ || ret == COMMIT_STATUS.COMMIT_FINISHED) {
try {
// Sync file data and length
fos.hsync(EnumSet.of(SyncFlag.UPDATE_LENGTH));
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1530837&r1=1530836&r2=1530837&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Oct 10 01:09:00 2013
@@ -27,6 +27,9 @@ Release 2.2.1 - UNRELEASED
HDFS-5281. COMMIT request should not block. (brandonli)
+ HDFS-5337. should do hsync for a commit request even there is no pending
+ writes (brandonli)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
