Author: liyin Date: Sat Apr 5 18:18:21 2014 New Revision: 1585154 URL: http://svn.apache.org/r1585154 Log: [master] Mark unstable testcases
Author: daviddeng Summary: `TestDistributedLogSplitting`, `TestHRegionClose` and `TestQOS` was marked as unstable. `TestHRegionDoubleClose` was rewritten not using inheritance to avoid unnecessary `setUp`/`tearDown`. Test Plan: mvn test Reviewers: liyintang, manukranthk, fan, gauravm Reviewed By: gauravm CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D1253907 Task ID: 3789093, 3863945, 4053598, 4053465 Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java?rev=1585154&r1=1585153&r2=1585154&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/UnstableTestSuite.java Sat Apr 5 18:18:21 2014 @@ -22,19 +22,19 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.hbase.client.TestScannerTimeout; import org.apache.hadoop.hbase.client.TestServerConfigFromClient; import org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat; +import org.apache.hadoop.hbase.master.TestDistributedLogSplitting; import org.apache.hadoop.hbase.master.TestLogSplitOnMasterFailover; import org.apache.hadoop.hbase.master.TestRSLivenessOnMasterFailover; -import org.apache.hadoop.hbase.master.TestRegionPlacement; import org.apache.hadoop.hbase.master.TestRegionStateOnMasterFailure; import org.apache.hadoop.hbase.master.TestSplitLogManager; import org.apache.hadoop.hbase.regionserver.TestHRegionCloseRetry; import org.apache.hadoop.hbase.regionserver.TestHRegionServerFileSystemFailure; +import org.apache.hadoop.hbase.regionserver.TestQOS; import org.apache.hadoop.hbase.regionserver.metrics.TestThriftMetrics; import org.apache.hadoop.hbase.regionserver.wal.TestHLog; import org.apache.hadoop.hbase.regionserver.wal.TestLogRolling; import org.apache.hadoop.hbase.regionserver.wal.TestWALReplay; import org.apache.hadoop.hbase.replication.regionserver.TestReplicationSink; -import org.apache.hadoop.hbase.util.TagRunner; import org.apache.hadoop.hbase.util.TestProcessBasedCluster; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -46,8 +46,9 @@ import org.junit.runners.Suite.SuiteClas TestProcessBasedCluster.class, TestRegionStateOnMasterFailure.class, TestScannerTimeout.class, TestWALReplay.class, TestThriftMetrics.class, TestServerConfigFromClient.class, TestRSLivenessOnMasterFailover.class, - TestLogSplitOnMasterFailover.class, TagRunner.class, + TestLogSplitOnMasterFailover.class, TestHRegionServerFileSystemFailure.class, TestFullLogReconstruction.class, - TestSplitLogManager.class, TestHLog.class }) + TestSplitLogManager.class, TestHLog.class, TestQOS.class, + TestDistributedLogSplitting.class }) public class UnstableTestSuite { } Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1585154&r1=1585153&r2=1585154&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Sat Apr 5 18:18:21 2014 @@ -19,14 +19,16 @@ */ package org.apache.hadoop.hbase.master; -import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.*; - +import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_wait_for_zk_delete; +import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_wkr_final_transistion_failed; +import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_wkr_task_acquired; +import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_wkr_task_err; +import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_wkr_task_resigned; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; @@ -47,7 +49,6 @@ import org.apache.hadoop.hbase.HBaseTest import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -55,18 +56,21 @@ import org.apache.hadoop.hbase.master.Sp import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.wal.HLog; -import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; +import org.apache.hadoop.hbase.util.TagRunner; +import org.apache.hadoop.hbase.util.TestTag; import org.apache.hadoop.hbase.zookeeper.ZKSplitLog; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.junit.Before; import org.junit.After; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(TagRunner.class) public class TestDistributedLogSplitting { private static final Log LOG = LogFactory.getLog(TestDistributedLogSplitting.class); static { @@ -117,6 +121,8 @@ public class TestDistributedLogSplitting TEST_UTIL.shutdownMiniCluster(); } + // Marked as unstable and recorded in #4053598 + @TestTag({ "unstable" }) @Test public void testThreeRSAbort() throws Exception { LOG.info("testThreeRSAbort"); @@ -172,7 +178,7 @@ public class TestDistributedLogSplitting HLog.getHLogDirectoryName(hrs.getServerInfo().getServerName())); HTable htable = installTable(table, family, NUM_REGIONS); - + Collection<HRegion> regions = new LinkedList<HRegion>(hrs.getOnlineRegions()); LOG.info("#regions = " + regions.size()); Iterator<HRegion> it = regions.iterator(); @@ -190,7 +196,7 @@ public class TestDistributedLogSplitting htable.put(p); } } - + slm.splitLogDistributed(logDir); for (HRegion rgn : regions) { @@ -234,6 +240,7 @@ public class TestDistributedLogSplitting } new Thread() { + @Override public void run() { waitForCounter(tot_wkr_task_acquired, 0, 1, 1000); for (RegionServerThread rst : rsts) { @@ -249,7 +256,7 @@ public class TestDistributedLogSplitting long curt = System.currentTimeMillis(); long endt = curt + 30000; while (curt < endt) { - if ((tot_wkr_task_resigned.get() + tot_wkr_task_err.get() + + if ((tot_wkr_task_resigned.get() + tot_wkr_task_err.get() + tot_wkr_final_transistion_failed.get()) == 0) { Thread.yield(); curt = System.currentTimeMillis(); Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java?rev=1585154&r1=1585153&r2=1585154&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestQOS.java Sat Apr 5 18:18:21 2014 @@ -1,14 +1,13 @@ package org.apache.hadoop.hbase.regionserver; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdfs.util.InjectionEvent; -import org.apache.hadoop.util.InjectionEventI; -import org.apache.hadoop.util.InjectionHandler; -import org.apache.hadoop.util.NativeCodeLoader; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -16,13 +15,19 @@ import org.apache.hadoop.hbase.client.Ge import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.util.TagRunner; +import org.apache.hadoop.hbase.util.TestTag; +import org.apache.hadoop.hdfs.util.InjectionEvent; import org.apache.hadoop.io.nativeio.NativeIO; - +import org.apache.hadoop.util.InjectionEventI; +import org.apache.hadoop.util.InjectionHandler; +import org.apache.hadoop.util.NativeCodeLoader; import org.junit.AfterClass; -import static org.junit.Assert.*; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(TagRunner.class) public class TestQOS { private static final Log LOG = LogFactory.getLog(TestQOS.class); protected static HBaseTestingUtility TEST_UTIL; @@ -46,6 +51,7 @@ public class TestQOS { public static class TestQOSHandler extends InjectionHandler { + @Override protected void _processEvent(InjectionEventI event, Object... args) { if (event == InjectionEvent.DATANODE_WRITE_BLOCK || event == InjectionEvent.DATANODE_READ_BLOCK) { @@ -68,6 +74,8 @@ public class TestQOS { } } + // Marked as unstable and recorded in #4053465 + @TestTag({ "unstable" }) @Test public void testBasic() throws Exception { byte[] family = "family".getBytes();
