From 6b60585fef3734b16fcad4c781d019f64c52e8ea Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Wed, 14 Dec 2011 22:52:45 +0000
Subject: [PATCH] HBASE-5030 Some tests do not close the HFile.Reader they use,
 leaving some file descriptors open (N Keywal)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1214519 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java | 2 ++
 .../apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java   | 1 +
 .../apache/hadoop/hbase/io/hfile/TestHFilePerformance.java  | 1 +
 .../java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java | 2 ++
 .../java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java   | 6 ++++++
 .../hadoop/hbase/mapreduce/TestHFileOutputFormat.java       | 1 +
 .../hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java   | 1 +
 7 files changed, 14 insertions(+)

diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java b/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
index 6e01e9527b4..2e7185ff70b 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
@@ -90,6 +90,8 @@ public class TestHalfStoreFileReader {
 
     Reference top = new Reference(midkey, Reference.Range.top);
     doTestOfScanAndReseek(p, fs, top, cacheConf);
+
+    r.close();
   }
 
   private void doTestOfScanAndReseek(Path p, FileSystem fs, Reference bottom,
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
index 6fa64fbee89..d8730867651 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
@@ -572,6 +572,7 @@ public class TestHFileBlockIndex {
           reader.getTrailer().getUncompressedDataIndexSize());
 
       reader.close();
+      reader2.close();
     }
   }
 
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
index 53fa42b3b10..59896c5c018 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
@@ -261,6 +261,7 @@ public class TestHFilePerformance extends TestCase {
             }
             break;
         }
+      reader.close();
     } else if("SequenceFile".equals(fileType)){
 
         SequenceFile.Reader reader;
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
index efeba1f168c..40d0ea6628b 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
@@ -87,6 +87,8 @@ public class TestReseekTo {
       scanner.reseekTo(Bytes.toBytes(key));
       assertEquals(value, scanner.getValueString());
     }
+
+    reader.close();
   }
 
 
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
index ffa971ac575..a5d4e3017fd 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
@@ -93,6 +93,8 @@ public class TestSeekTo extends HBaseTestCase {
     assertEquals("i", toRowStr(scanner.getKeyValue()));
     assertEquals(true, scanner.seekBefore(toKV("l").getKey()));
     assertEquals("k", toRowStr(scanner.getKeyValue()));
+
+    reader.close();
   }
 
   public void testSeekTo() throws Exception {
@@ -113,6 +115,8 @@ public class TestSeekTo extends HBaseTestCase {
 
     assertEquals(1, scanner.seekTo(toKV("l").getKey()));
     assertEquals("k", toRowStr(scanner.getKeyValue()));
+
+    reader.close();
   }
 
   public void testBlockContainingKey() throws Exception {
@@ -144,6 +148,8 @@ public class TestSeekTo extends HBaseTestCase {
         toKV("k").getKey(), 0, klen));
     assertEquals(1, blockIndexReader.rootBlockContainingKey(
         toKV("l").getKey(), 0, klen));
+
+    reader.close();
  }
 
   @org.junit.Rule
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
index 40cd93348f4..140d54fa147 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
@@ -296,6 +296,7 @@ public class TestHFileOutputFormat  {
           "...." + timeRangeTracker.getMaximumTimestamp());
       assertEquals(1000, timeRangeTracker.getMinimumTimestamp());
       assertEquals(2000, timeRangeTracker.getMaximumTimestamp());
+      rd.close();
     } finally {
       if (writer != null && context != null) writer.close(context);
       dir.getFileSystem(conf).delete(dir, true);
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
index 6e6c1dc4420..a953af0cd8f 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
@@ -191,6 +191,7 @@ public class TestLoadIncrementalHFiles {
       count++;
     } while (scanner.next());
     assertTrue(count > 0);
+    reader.close();
     return count;
   }