hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1391660 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
Date Fri, 28 Sep 2012 21:10:27 GMT
Author: mattf
Date: Fri Sep 28 21:10:27 2012
New Revision: 1391660

URL: http://svn.apache.org/viewvc?rev=1391660&view=rev
Log:
merge 1365883 from branch-1. HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind
reads even for short reads.  Contributed by Brandon Li.

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1391660&r1=1391659&r2=1391660&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Fri Sep 28 21:10:27 2012
@@ -10,7 +10,7 @@ Release 1.1.1 - Unreleased
 
   BUG FIXES
 
-Release 1.1.0 - 2012.09.16
+Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES
 
@@ -397,6 +397,9 @@ Release 1.1.0 - 2012.09.16
     HDFS-3701. HDFS may miss the final block when reading a file opened for writing
     if one of the datanode is dead. (umamahesh and nkeywal via umamahesh)
 
+    HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads
+    even for short reads.  (Brandon Li via szetszwo)
+
 
 Release 1.0.4 - Unreleased
 

Propchange: hadoop/common/branches/branch-1.1/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1365883

Modified: hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java?rev=1391660&r1=1391659&r2=1391660&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
(original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
Fri Sep 28 21:10:27 2012
@@ -206,7 +206,7 @@ class BlockSender implements java.io.Clo
    * close opened files.
    */
   public void close() throws IOException {
-    if (blockInFd != null && shouldDropCacheBehindRead) {
+    if (blockInFd != null && shouldDropCacheBehindRead && isLongRead()) {
       // drop the last few MB of the file from cache
       try {
         NativeIO.posixFadviseIfPossible(blockInFd, lastCacheDropOffset, offset



Mime
View raw message