svn commit: r733889 - in /hadoop/core/branches/branch-0.20: ./ CHANGES.txt src/test/org/apache/hadoop/hdfs/TestReplication.java

[hairong]

Author: hairong
Date: Mon Jan 12 12:21:43 2009
New Revision: 733889

URL: http://svn.apache.org/viewvc?rev=733889&view=rev
Log:
Merge -r 733886:733887 from trunk to move the change of HADOOP-5008 into branch 
0.20. 

Modified:
    hadoop/core/branches/branch-0.20/   (props changed)
    hadoop/core/branches/branch-0.20/CHANGES.txt   (contents, props changed)
    
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestReplication.java

Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 12:21:43 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=733889&r1=733888&r2=733889&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Mon Jan 12 12:21:43 2009
@@ -571,6 +571,9 @@
 
     HADOOP-4982. TestFsck should run in Eclipse. (shv)
 
+    HADOOP-5008. TestReplication#testPendingReplicationRetry leaves an opened
+    fd unclosed. (hairong)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 12:21:43 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887

Modified: 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestReplication.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestReplication.java?rev=733889&r1=733888&r2=733889&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestReplication.java
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestReplication.java
 Mon Jan 12 12:21:43 2009
@@ -350,8 +350,12 @@
             long len = blockFile.length();
             assertTrue(len > 50);
             RandomAccessFile blockOut = new RandomAccessFile(blockFile, "rw");
-            blockOut.seek(len/3);
-            blockOut.write(buffer, 0, 25);
+            try {
+              blockOut.seek(len/3);
+              blockOut.write(buffer, 0, 25);
+            } finally {
+              blockOut.close();
+            }
           }
           fileCount++;
         }