You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/12/14 23:52:46 UTC
svn commit: r1214519 - in
/hbase/trunk/src/test/java/org/apache/hadoop/hbase: io/ io/hfile/ mapreduce/
Author: tedyu
Date: Wed Dec 14 22:52:45 2011
New Revision: 1214519
URL: http://svn.apache.org/viewvc?rev=1214519&view=rev
Log:
HBASE-5030 Some tests do not close the HFile.Reader they use, leaving some file descriptors open (N Keywal)
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java Wed Dec 14 22:52:45 2011
@@ -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,
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java Wed Dec 14 22:52:45 2011
@@ -572,6 +572,7 @@ public class TestHFileBlockIndex {
reader.getTrailer().getUncompressedDataIndexSize());
reader.close();
+ reader2.close();
}
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java Wed Dec 14 22:52:45 2011
@@ -261,6 +261,7 @@ public class TestHFilePerformance extend
}
break;
}
+ reader.close();
} else if("SequenceFile".equals(fileType)){
SequenceFile.Reader reader;
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java Wed Dec 14 22:52:45 2011
@@ -87,6 +87,8 @@ public class TestReseekTo {
scanner.reseekTo(Bytes.toBytes(key));
assertEquals(value, scanner.getValueString());
}
+
+ reader.close();
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java Wed Dec 14 22:52:45 2011
@@ -93,6 +93,8 @@ public class TestSeekTo extends HBaseTes
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 HBaseTes
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 HBaseTes
toKV("k").getKey(), 0, klen));
assertEquals(1, blockIndexReader.rootBlockContainingKey(
toKV("l").getKey(), 0, klen));
+
+ reader.close();
}
@org.junit.Rule
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java Wed Dec 14 22:52:45 2011
@@ -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);
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java?rev=1214519&r1=1214518&r2=1214519&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java Wed Dec 14 22:52:45 2011
@@ -191,6 +191,7 @@ public class TestLoadIncrementalHFiles {
count++;
} while (scanner.next());
assertTrue(count > 0);
+ reader.close();
return count;
}