You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/12/05 22:20:05 UTC
svn commit: r1210643 - in /hbase/trunk: ./ dev-support/
src/test/java/org/apache/hadoop/hbase/
src/test/java/org/apache/hadoop/hbase/filter/
src/test/java/org/apache/hadoop/hbase/ipc/
src/test/java/org/apache/hadoop/hbase/regionserver/ src/test/java/or...
Author: stack
Date: Mon Dec 5 21:20:04 2011
New Revision: 1210643
URL: http://svn.apache.org/viewvc?rev=1210643&view=rev
Log:
HBASE-4847 Activate single jvm for small tests on jenkins
Modified:
hbase/trunk/dev-support/hbasetests.sh
hbase/trunk/pom.xml
hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
Modified: hbase/trunk/dev-support/hbasetests.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/hbasetests.sh?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/dev-support/hbasetests.sh (original)
+++ hbase/trunk/dev-support/hbasetests.sh Mon Dec 5 21:20:04 2011
@@ -307,11 +307,11 @@ echo "Small tests executed after $exeTim
if (test $parallelMaven -gt 0)
then
echo "Running tests with two maven instances in parallel"
- $mvnCommand -P nonParallelTests test -Dtest=$runList1 $args &
+ $mvnCommand -P localTests test -Dtest=$runList1 $args &
#give some time to the fist process if there is anything to compile
sleep 30
- $mvnCommand -P nonParallelTests test -Dtest=$runList2 $args
+ $mvnCommand -P localTests test -Dtest=$runList2 $args
#wait for forked process to finish
wait
@@ -326,14 +326,14 @@ then
if (test $runAllTests -eq 1 && test ${#flakyTests} -gt 5)
then
echo "Running flaky tests"
- $mvnCommand -P nonParallelTests test -Dtest=$flakyTests $args
+ $mvnCommand -P localTests test -Dtest=$flakyTests $args
cleanProcess
exeTime=$(((`date +%s` - $startTime)/60))
echo "Flaky tests executed after $exeTime minutes"
fi
else
echo "Running tests with a single maven instance, no parallelization"
- $mvnCommand -P nonParallelTests test -Dtest=$runList1,$runList2,$flakyTests $args
+ $mvnCommand -P localTests test -Dtest=$runList1,$runList2,$flakyTests $args
cleanProcess
exeTime=$(((`date +%s` - $startTime)/60))
echo "Single maven instance tests executed after $exeTime minutes"
@@ -420,7 +420,7 @@ then
if (test $replayFailed -gt 0)
then
echo "Replaying all tests that failed"
- $mvnCommand -P nonParallelTests test -Dtest=$replayList $args
+ $mvnCommand -P localTests test -Dtest=$replayList $args
echo "Replaying done"
fi
fi
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Mon Dec 5 21:20:04 2011
@@ -329,9 +329,7 @@
-->
<dependency>
<groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <!-- Despite its name, junit47 supports 4.8 features
- as categories -->
+ <artifactId>${surefire.provider}</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
@@ -351,7 +349,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>${surefire.provider}</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
+ <includes>
+ <include>${integrationtest.include}</include>
+ </includes>
+ <excludes>
+ <exlude>${unittest.include}</exlude>
+ <exclude>**/*$*</exclude>
+ <exclude>${test.exclude.pattern}</exclude>
+ </excludes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
<environmentVariables>
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/nativelib</LD_LIBRARY_PATH>
<DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/nativelib</DYLD_LIBRARY_PATH>
@@ -605,13 +619,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>${surefire.skipfirstPartTests}</skip>
+ <skip>${surefire.skipFirstPart}</skip>
<forkMode>${surefire.firstPartForkMode}</forkMode>
<parallel>${surefire.firstPartParallel}</parallel>
<perCoreThreadCount>false</perCoreThreadCount>
<threadCount>${surefire.firstPartThreadCount}</threadCount>
<groups>${surefire.firstPartGroups}</groups>
- <testFailureIgnore>${surefire.hasSecondPart}</testFailureIgnore>
+ <testFailureIgnore>false</testFailureIgnore>
</configuration>
<executions>
<execution>
@@ -634,8 +648,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>false</skip>
- <forkMode>always</forkMode>
- <groups>org.apache.hadoop.hbase.LargeTests</groups>
+ <forkMode>always</forkMode>
</configuration>
</plugin>
<plugin>
@@ -872,22 +885,24 @@
<!-- also must update this when we bump version -->
<package.version>0.91.0</package.version>
<final.name>${project.artifactId}-${project.version}</final.name>
+
+ <!-- Test inclusion patterns used by failsafe configuration -->
+ <unittest.include>**/Test*.java</unittest.include>
+ <integrationtest.include>**/IntegrationTest*.java</integrationtest.include>
<surefire.version>2.11-TRUNK-HBASE-2</surefire.version>
- <!-- in the default env, we're configured for the worst case -->
- <surefire.firstPartForkMode>always</surefire.firstPartForkMode>
- <surefire.firstPartParallel>none</surefire.firstPartParallel>
- <surefire.firstPartThreadCount>1</surefire.firstPartThreadCount>
+ <surefire.provider>surefire-junit47</surefire.provider>
- <!-- default will be to run small & medium
- Right now we run all tests as before.
- -->
+ <!-- default: run small & medium -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
- <surefire.skipSecondPart>true</surefire.skipSecondPart>
- <surefire.hasSecondPart>false</surefire.hasSecondPart>
+ <surefire.skipSecondPart>false</surefire.skipSecondPart>
+
+ <surefire.firstPartForkMode>once</surefire.firstPartForkMode>
+ <surefire.firstPartParallel>none</surefire.firstPartParallel>
+ <surefire.firstPartThreadCount>1</surefire.firstPartThreadCount>
- <surefire.firstPartGroups></surefire.firstPartGroups>
- <surefire.secondPartGroups></surefire.secondPartGroups>
+ <surefire.firstPartGroups>org.apache.hadoop.hbase.SmallTests</surefire.firstPartGroups>
+ <surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests</surefire.secondPartGroups>
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
@@ -901,6 +916,7 @@
* javax.xml.stream:stax-api in favour of stax:stax-api
-->
+
<!-- General dependencies -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -1886,6 +1902,10 @@
<surefire.firstPartForkMode>once</surefire.firstPartForkMode>
<surefire.firstPartParallel>none</surefire.firstPartParallel>
<surefire.firstPartThreadCount>1</surefire.firstPartThreadCount>
+
+ <surefire.skipFirstPart>false</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ <surefire.firstPartGroups></surefire.firstPartGroups>
</properties>
</profile>
@@ -1912,6 +1932,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
+ <surefire.firstPartForkMode>always</surefire.firstPartForkMode>
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>true</surefire.skipSecondPart>
<surefire.firstPartGroups>org.apache.hadoop.hbase.MediumTests</surefire.firstPartGroups>
@@ -1925,6 +1946,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
+ <surefire.firstPartForkMode>always</surefire.firstPartForkMode>
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>true</surefire.skipSecondPart>
<surefire.firstPartGroups>org.apache.hadoop.hbase.LargeTests</surefire.firstPartGroups>
@@ -1944,11 +1966,10 @@
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart>
- <surefire.hasSecondPart>true</surefire.hasSecondPart>
<surefire.firstPartGroups>org.apache.hadoop.hbase.SmallTests</surefire.firstPartGroups>
<surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests</surefire.secondPartGroups>
</properties>
- </profile>
+ </profile>
<profile> <!-- Use it to launch all tests -->
<id>runAllTests</id>
@@ -1962,11 +1983,37 @@
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart>
- <surefire.hasSecondPart>true</surefire.hasSecondPart>
<surefire.firstPartGroups>org.apache.hadoop.hbase.SmallTests</surefire.firstPartGroups>
<surefire.secondPartGroups>org.apache.hadoop.hbase.MediumTests,org.apache.hadoop.hbase.LargeTests</surefire.secondPartGroups>
</properties>
- </profile>
+ </profile>
+
+ <profile> <!-- Use it skip the surefire tests but no the failsafe tests -->
+ <id>skipSurefireTests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <surefire.skipFirstPart>true</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ </properties>
+ </profile>
+
+ <profile> <!-- Use it to launch tests locally-->
+ <id>localTests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <surefire.provider>surefire-junit4</surefire.provider>
+ <surefire.version>2.10</surefire.version>
+
+ <surefire.firstPartForkMode>always</surefire.firstPartForkMode>
+ <surefire.skipFirstPart>false</surefire.skipFirstPart>
+ <surefire.skipSecondPart>true</surefire.skipSecondPart>
+ <surefire.firstPartGroups></surefire.firstPartGroups>
+ </properties>
+ </profile>
</profiles>
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java Mon Dec 5 21:20:04 2011
@@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.client.Re
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
-import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.*;
import org.apache.hadoop.hdfs.MiniDFSCluster;
/**
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java Mon Dec 5 21:20:04 2011
@@ -97,6 +97,9 @@ public class TestColumnPrefixFilter {
while(scanner.next(results));
assertEquals(prefixMap.get(s).size(), results.size());
}
+
+ region.close();
+ region.getLog().closeAndDelete();
}
@Test
@@ -157,6 +160,9 @@ public class TestColumnPrefixFilter {
while(scanner.next(results));
assertEquals(prefixMap.get(s).size(), results.size());
}
+
+ region.close();
+ region.getLog().closeAndDelete();
}
List<String> generateRandomWords(int numberOfWords, String suffix) {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java Mon Dec 5 21:20:04 2011
@@ -83,6 +83,7 @@ public class TestDependentColumnFilter e
protected void tearDown() throws Exception {
super.tearDown();
this.region.close();
+ region.getLog().closeAndDelete();
}
private void addData() throws IOException {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java Mon Dec 5 21:20:04 2011
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.filter.Co
import org.apache.hadoop.hbase.filter.FilterList.Operator;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.experimental.categories.Category;
@@ -163,7 +164,9 @@ public class TestFilter extends HBaseTes
}
protected void tearDown() throws Exception {
- this.region.close();
+ HLog hlog = region.getLog();
+ region.close();
+ hlog.closeAndDelete();
super.tearDown();
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java Mon Dec 5 21:20:04 2011
@@ -99,6 +99,9 @@ public class TestMultipleColumnPrefixFil
InternalScanner scanner = region.getScanner(scan);
while(scanner.next(results));
assertEquals(prefixMap.get("p").size() + prefixMap.get("q").size(), results.size());
+
+ region.close();
+ region.getLog().closeAndDelete();
}
@Test
@@ -165,6 +168,9 @@ public class TestMultipleColumnPrefixFil
InternalScanner scanner = region.getScanner(scan);
while(scanner.next(results));
assertEquals(prefixMap.get("p").size() + prefixMap.get("q").size(), results.size());
+
+ region.close();
+ region.getLog().closeAndDelete();
}
@Test
@@ -218,6 +224,9 @@ public class TestMultipleColumnPrefixFil
while(scanner2.next(results2));
assertEquals(results1.size(), results2.size());
+
+ region.close();
+ region.getLog().closeAndDelete();
}
List<String> generateRandomWords(int numberOfWords, String suffix) {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java Mon Dec 5 21:20:04 2011
@@ -30,9 +30,9 @@ import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.Assert;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.ipc.VersionedProtocol;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Logger;
@@ -45,7 +45,7 @@ import org.junit.experimental.categories
* be delayed. Check that the last two, which are undelayed, return before the
* first one.
*/
-@Category(SmallTests.class)
+@Category(MediumTests.class) // Fails sometimes with small tests
public class TestDelayedRpc {
public static RpcServer rpcServer;
@@ -233,11 +233,15 @@ public class TestDelayedRpc {
@Override
public void run() {
- Integer result = new Integer(server.test(delay));
- if (results != null) {
- synchronized (results) {
- results.add(result);
+ try {
+ Integer result = new Integer(server.test(delay));
+ if (results != null) {
+ synchronized (results) {
+ results.add(result);
+ }
}
+ } catch (Exception e) {
+ fail("Unexpected exception: "+e.getMessage());
}
}
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java Mon Dec 5 21:20:04 2011
@@ -157,6 +157,9 @@ public class TestColumnSeeking {
assertEquals(kvSet.size(), results.size());
assertTrue(results.containsAll(kvSet));
}
+
+ region.close();
+ region.getLog().closeAndDelete();
}
@SuppressWarnings("unchecked")
@@ -263,6 +266,9 @@ public class TestColumnSeeking {
assertEquals(kvSet.size(), results.size());
assertTrue(results.containsAll(kvSet));
}
+
+ region.close();
+ region.getLog().closeAndDelete();
}
List<String> generateRandomWords(int numberOfWords, String suffix) {
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Mon Dec 5 21:20:04 2011
@@ -1339,6 +1339,7 @@ public class TestHRegion extends HBaseTe
for (int i = 0; i < subregions.length; i++) {
try {
subregions[i].close();
+ subregions[i].getLog().closeAndDelete();
} catch (IOException e) {
// Ignore.
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java Mon Dec 5 21:20:04 2011
@@ -133,6 +133,9 @@ public class TestKeepDeletes extends HBa
r = region.get(g, null);
checkResult(r, c0, c0, T1);
assertEquals(0, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -180,6 +183,9 @@ public class TestKeepDeletes extends HBa
kvs = new ArrayList<KeyValue>();
scan.next(kvs);
assertTrue(kvs.isEmpty());
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -222,6 +228,9 @@ public class TestKeepDeletes extends HBa
region.compactStores(true);
// major compaction deleted it
assertEquals(0, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -243,6 +252,9 @@ public class TestKeepDeletes extends HBa
} catch (DoNotRetryIOException dnre) {
// ok!
}
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -287,6 +299,9 @@ public class TestKeepDeletes extends HBa
assertTrue(kvs.get(3).isDeleteType());
assertEquals(kvs.get(4).getValue(), T2);
assertEquals(kvs.get(5).getValue(), T1);
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -327,6 +342,9 @@ public class TestKeepDeletes extends HBa
// major compaction removes all, since there are no puts they affect
region.compactStores(true);
assertEquals(0, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -387,6 +405,9 @@ public class TestKeepDeletes extends HBa
// so after this collection all markers
region.compactStores(true);
assertEquals(0, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -464,6 +485,9 @@ public class TestKeepDeletes extends HBa
checkGet(region, T2, c0, c1, ts+3);
checkGet(region, T2, c1, c0, ts+3, T2, T1);
checkGet(region, T2, c1, c1, ts+3, T2, T1);
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -556,6 +580,9 @@ public class TestKeepDeletes extends HBa
region.compactStores(true);
region.compactStores(true);
assertEquals(1, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -604,6 +631,9 @@ public class TestKeepDeletes extends HBa
scanner.next(kvs);
assertEquals(4, kvs.size());
scanner.close();
+
+ region.close();
+ region.getLog().closeAndDelete();
}
/**
@@ -679,6 +709,9 @@ public class TestKeepDeletes extends HBa
// so after the next compaction the last family delete marker is also gone
region.compactStores(true);
assertEquals(0, countDeleteMarkers(region));
+
+ region.close();
+ region.getLog().closeAndDelete();
}
private void checkGet(HRegion region, byte[] row, byte[] fam, byte[] col,
@@ -689,7 +722,7 @@ public class TestKeepDeletes extends HBa
g.setTimeRange(0L, time);
Result r = region.get(g, null);
checkResult(r, fam, col, vals);
-
+
}
private int countDeleteMarkers(HRegion region) throws IOException {
@@ -707,7 +740,7 @@ public class TestKeepDeletes extends HBa
}
kvs.clear();
} while (hasMore);
- scan.close();
+ scan.close();
return res;
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java Mon Dec 5 21:20:04 2011
@@ -308,6 +308,7 @@ public class TestMultiColumnScanner {
LOG.info("Number of row/col pairs deleted at least once: " +
lastDelTimeMap.size());
region.close();
+ region.getLog().closeAndDelete();
}
static HRegion createRegion(String tableName,
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java Mon Dec 5 21:20:04 2011
@@ -94,5 +94,7 @@ public class TestResettingCounters {
assertTrue(Bytes.equals(kvs[i].getQualifier(), qualifiers[i]));
assertEquals(6, Bytes.toLong(kvs[i].getValue()));
}
+ region.close();
+ region.getLog().closeAndDelete();
}
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java Mon Dec 5 21:20:04 2011
@@ -104,6 +104,7 @@ public class TestScanWithBloomError {
scanColSet(new int[]{1, 4, 6, 7}, new int[]{1, 6, 7});
region.close();
+ region.getLog().closeAndDelete();
}
private void scanColSet(int[] colSet, int[] expectedResultCols)
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java Mon Dec 5 21:20:04 2011
@@ -427,6 +427,7 @@ public class TestSeekOptimizations {
public void tearDown() throws IOException {
if (region != null) {
region.close();
+ region.getLog().closeAndDelete();
}
// We have to re-set the lazy seek flag back to the default so that other
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java Mon Dec 5 21:20:04 2011
@@ -200,6 +200,7 @@ public class TestSplitTransaction {
daughtersRowCount += count;
} finally {
openRegion.close();
+ openRegion.getLog().closeAndDelete();
}
}
assertEquals(rowcount, daughtersRowCount);
@@ -255,6 +256,7 @@ public class TestSplitTransaction {
daughtersRowCount += count;
} finally {
openRegion.close();
+ openRegion.getLog().closeAndDelete();
}
}
assertEquals(rowcount, daughtersRowCount);
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Mon Dec 5 21:20:04 2011
@@ -388,6 +388,12 @@ public class TestStore extends TestCase
assertEquals(oldValue, Bytes.toLong(results.get(1).getValue()));
}
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ EnvironmentEdgeManagerTestHelper.reset();
+ }
+
public void testICV_negMemstoreSize() throws IOException {
init(this.getName());
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java Mon Dec 5 21:20:04 2011
@@ -41,7 +41,8 @@ import java.util.NavigableSet;
import java.util.TreeSet;
import static org.apache.hadoop.hbase.regionserver.KeyValueScanFixture.scanFixture;
-@Category(SmallTests.class)
+// Can't be small as it plays with EnvironmentEdgeManager
+@Category(MediumTests.class)
public class TestStoreScanner extends TestCase {
private static final String CF_STR = "cf";
final byte [] CF = Bytes.toBytes(CF_STR);
@@ -502,69 +503,73 @@ public class TestStoreScanner extends Te
}
public void testDeleteMarkerLongevity() throws Exception {
- final long now = System.currentTimeMillis();
- EnvironmentEdgeManagerTestHelper.injectEdge(new EnvironmentEdge() {
- public long currentTimeMillis() {
- return now;
- }
- });
- KeyValue [] kvs = new KeyValue[] {
+ try {
+ final long now = System.currentTimeMillis();
+ EnvironmentEdgeManagerTestHelper.injectEdge(new EnvironmentEdge() {
+ public long currentTimeMillis() {
+ return now;
+ }
+ });
+ KeyValue[] kvs = new KeyValue[]{
/*0*/ new KeyValue(Bytes.toBytes("R1"), Bytes.toBytes("cf"), null,
- now-100, KeyValue.Type.DeleteFamily), // live
+ now - 100, KeyValue.Type.DeleteFamily), // live
/*1*/ new KeyValue(Bytes.toBytes("R1"), Bytes.toBytes("cf"), null,
- now-1000, KeyValue.Type.DeleteFamily), // expired
- /*2*/ KeyValueTestUtil.create("R1", "cf", "a", now-50,
- KeyValue.Type.Put, "v3"), // live
- /*3*/ KeyValueTestUtil.create("R1", "cf", "a", now-55,
- KeyValue.Type.Delete, "dontcare"), // live
- /*4*/ KeyValueTestUtil.create("R1", "cf", "a", now-55,
- KeyValue.Type.Put, "deleted-version v2"), // deleted
- /*5*/ KeyValueTestUtil.create("R1", "cf", "a", now-60,
- KeyValue.Type.Put, "v1"), // live
- /*6*/ KeyValueTestUtil.create("R1", "cf", "a", now-65,
- KeyValue.Type.Put, "v0"), // max-version reached
+ now - 1000, KeyValue.Type.DeleteFamily), // expired
+ /*2*/ KeyValueTestUtil.create("R1", "cf", "a", now - 50,
+ KeyValue.Type.Put, "v3"), // live
+ /*3*/ KeyValueTestUtil.create("R1", "cf", "a", now - 55,
+ KeyValue.Type.Delete, "dontcare"), // live
+ /*4*/ KeyValueTestUtil.create("R1", "cf", "a", now - 55,
+ KeyValue.Type.Put, "deleted-version v2"), // deleted
+ /*5*/ KeyValueTestUtil.create("R1", "cf", "a", now - 60,
+ KeyValue.Type.Put, "v1"), // live
+ /*6*/ KeyValueTestUtil.create("R1", "cf", "a", now - 65,
+ KeyValue.Type.Put, "v0"), // max-version reached
/*7*/ KeyValueTestUtil.create("R1", "cf", "a",
- now-100, KeyValue.Type.DeleteColumn, "dont-care"), // max-version
- /*8*/ KeyValueTestUtil.create("R1", "cf", "b", now-600,
- KeyValue.Type.DeleteColumn, "dont-care"), //expired
- /*9*/ KeyValueTestUtil.create("R1", "cf", "b", now-70,
- KeyValue.Type.Put, "v2"), //live
- /*10*/ KeyValueTestUtil.create("R1", "cf", "b", now-750,
- KeyValue.Type.Put, "v1"), //expired
- /*11*/ KeyValueTestUtil.create("R1", "cf", "c", now-500,
- KeyValue.Type.Delete, "dontcare"), //expired
- /*12*/ KeyValueTestUtil.create("R1", "cf", "c", now-600,
- KeyValue.Type.Put, "v1"), //expired
- /*13*/ KeyValueTestUtil.create("R1", "cf", "c", now-1000,
- KeyValue.Type.Delete, "dontcare"), //expired
- /*14*/ KeyValueTestUtil.create("R1", "cf", "d", now-60,
- KeyValue.Type.Put, "expired put"), //live
- /*15*/ KeyValueTestUtil.create("R1", "cf", "d", now-100,
- KeyValue.Type.Delete, "not-expired delete"), //live
- };
- List<KeyValueScanner> scanners = scanFixture(kvs);
- Scan scan = new Scan();
- scan.setMaxVersions(2);
- Store.ScanInfo scanInfo = new Store.ScanInfo(Bytes.toBytes("cf"),
+ now - 100, KeyValue.Type.DeleteColumn, "dont-care"), // max-version
+ /*8*/ KeyValueTestUtil.create("R1", "cf", "b", now - 600,
+ KeyValue.Type.DeleteColumn, "dont-care"), //expired
+ /*9*/ KeyValueTestUtil.create("R1", "cf", "b", now - 70,
+ KeyValue.Type.Put, "v2"), //live
+ /*10*/ KeyValueTestUtil.create("R1", "cf", "b", now - 750,
+ KeyValue.Type.Put, "v1"), //expired
+ /*11*/ KeyValueTestUtil.create("R1", "cf", "c", now - 500,
+ KeyValue.Type.Delete, "dontcare"), //expired
+ /*12*/ KeyValueTestUtil.create("R1", "cf", "c", now - 600,
+ KeyValue.Type.Put, "v1"), //expired
+ /*13*/ KeyValueTestUtil.create("R1", "cf", "c", now - 1000,
+ KeyValue.Type.Delete, "dontcare"), //expired
+ /*14*/ KeyValueTestUtil.create("R1", "cf", "d", now - 60,
+ KeyValue.Type.Put, "expired put"), //live
+ /*15*/ KeyValueTestUtil.create("R1", "cf", "d", now - 100,
+ KeyValue.Type.Delete, "not-expired delete"), //live
+ };
+ List<KeyValueScanner> scanners = scanFixture(kvs);
+ Scan scan = new Scan();
+ scan.setMaxVersions(2);
+ Store.ScanInfo scanInfo = new Store.ScanInfo(Bytes.toBytes("cf"),
0 /* minVersions */,
2 /* maxVersions */, 500 /* ttl */,
false /* keepDeletedCells */,
200, /* timeToPurgeDeletes */
KeyValue.COMPARATOR);
- StoreScanner scanner =
+ StoreScanner scanner =
new StoreScanner(scan, scanInfo,
- StoreScanner.ScanType.MAJOR_COMPACT, null, scanners,
- HConstants.OLDEST_TIMESTAMP);
- List<KeyValue> results = new ArrayList<KeyValue>();
- results = new ArrayList<KeyValue>();
- assertEquals(true, scanner.next(results));
- assertEquals(kvs[0], results.get(0));
- assertEquals(kvs[2], results.get(1));
- assertEquals(kvs[3], results.get(2));
- assertEquals(kvs[5], results.get(3));
- assertEquals(kvs[9], results.get(4));
- assertEquals(kvs[14], results.get(5));
- assertEquals(kvs[15], results.get(6));
- assertEquals(7, results.size());
- }
+ StoreScanner.ScanType.MAJOR_COMPACT, null, scanners,
+ HConstants.OLDEST_TIMESTAMP);
+ List<KeyValue> results = new ArrayList<KeyValue>();
+ results = new ArrayList<KeyValue>();
+ assertEquals(true, scanner.next(results));
+ assertEquals(kvs[0], results.get(0));
+ assertEquals(kvs[2], results.get(1));
+ assertEquals(kvs[3], results.get(2));
+ assertEquals(kvs[5], results.get(3));
+ assertEquals(kvs[9], results.get(4));
+ assertEquals(kvs[14], results.get(5));
+ assertEquals(kvs[15], results.get(6));
+ assertEquals(7, results.size());
+ }finally{
+ EnvironmentEdgeManagerTestHelper.reset();
+ }
+ }
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java Mon Dec 5 21:20:04 2011
@@ -36,7 +36,8 @@ import org.junit.experimental.categories
/**
* Tests for {@link FSTableDescriptors}.
*/
-@Category(SmallTests.class)
+// Do not support to be executed in he same JVM as other tests
+@Category(MediumTests.class)
public class TestFSTableDescriptors {
private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static final Log LOG = LogFactory.getLog(TestFSTableDescriptors.class);
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java?rev=1210643&r1=1210642&r2=1210643&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java Mon Dec 5 21:20:04 2011
@@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.util;
import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,7 +30,7 @@ import static junit.framework.Assert.ass
* Tests that the incrementing environment edge increments time instead of using
* the default.
*/
-@Category(MediumTests.class)
+@Category(SmallTests.class)
public class TestIncrementingEnvironmentEdge {
@Test