HDFS-5337. Merging change r1530835 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530836 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2013-10-10 01:04:38 +00:00
parent 3bc8333232
commit 1c128966f3
2 changed files with 5 additions and 1 deletions

View File

@ -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));

View File

@ -117,6 +117,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