You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/04/02 22:49:34 UTC

svn commit: r1584171 - in /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase: TestFullLogReconstruction.java UnstableTestSuite.java master/TestSplitLogManager.java regionserver/TestHRegionDoubleClose.java regionserver/wal/TestHLog.java

Author: liyin
Date: Wed Apr  2 20:49:34 2014
New Revision: 1584171

URL: http://svn.apache.org/r1584171
Log:
[master] Mark some testcases as unstable.

Author: daviddeng

Summary:
`TestFullLogReconstruction`
`TestSplitLogManager`
`TestHLog`

Test Plan: Run testcases

Reviewers: liyintang, manukranthk, fan

Reviewed By: fan

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1234220

Task ID: 3789093, 3297526, 3296253, 3862247, 3977473, 3376834

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
    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/TestSplitLogManager.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionDoubleClose.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java?rev=1584171&r1=1584170&r2=1584171&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java Wed Apr  2 20:49:34 2014
@@ -28,12 +28,16 @@ import org.apache.hadoop.hbase.client.Re
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.TagRunner;
+import org.apache.hadoop.hbase.util.TestTag;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@RunWith(TagRunner.class)
 public class TestFullLogReconstruction {
 
   private final static HBaseTestingUtility
@@ -93,6 +97,8 @@ public class TestFullLogReconstruction {
    * see all the rows.
    * @throws Exception
    */
+  // Marked as unstable and recored in #3977473
+  @TestTag({ "unstable" })
   @Test (timeout = 300000)
   public void testReconstruction() throws Exception {
 

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=1584171&r1=1584170&r2=1584171&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 Wed Apr  2 20:49:34 2014
@@ -27,9 +27,11 @@ import org.apache.hadoop.hbase.master.Te
 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.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;
@@ -47,6 +49,7 @@ import org.junit.runners.Suite.SuiteClas
     TestRegionPlacement.class, TestServerConfigFromClient.class,
     TestRSLivenessOnMasterFailover.class, TestLogSplitOnMasterFailover.class,
     TagRunner.class, TestHRegionServerFileSystemFailure.class,
-    TestFromClientSide.class })
+    TestFromClientSide.class, TestFullLogReconstruction.class,
+    TestSplitLogManager.class, TestHLog.class })
 public class UnstableTestSuite {
 }

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java?rev=1584171&r1=1584170&r2=1584171&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java Wed Apr  2 20:49:34 2014
@@ -19,22 +19,43 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.*;
-import static org.junit.Assert.*;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.resetCounters;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_get_data_nonode;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_heartbeat;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_log_split_batch_success;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_node_create_queued;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_node_create_result;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_orphan_task_acquired;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_rescan;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_rescan_deleted;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_resubmit;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_resubmit_dead_server_task;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_resubmit_failed;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_resubmit_threshold_reached;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_resubmit_unassigned;
+import static org.apache.hadoop.hbase.zookeeper.ZKSplitLog.Counters.tot_mgr_task_deleted;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.UUID;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.Stoppable;
 import org.apache.hadoop.hbase.master.SplitLogManager.Task;
 import org.apache.hadoop.hbase.master.SplitLogManager.TaskBatch;
+import org.apache.hadoop.hbase.util.TagRunner;
+import org.apache.hadoop.hbase.util.TestTag;
 import org.apache.hadoop.hbase.zookeeper.ZKSplitLog;
 import org.apache.hadoop.hbase.zookeeper.ZKSplitLog.TaskState;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
@@ -51,11 +72,9 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import java.util.UUID;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-
+import org.junit.runner.RunWith;
 
+@RunWith(TagRunner.class)
 public class TestSplitLogManager {
   private static final Log LOG = LogFactory.getLog(TestSplitLogManager.class);
   static {
@@ -135,6 +154,7 @@ public class TestSplitLogManager {
   private void waitForCounter(final AtomicLong ctr, long oldval, long newval,
       long timems) {
     Expr e = new Expr() {
+      @Override
       public long eval() {
         return ctr.get();
       }
@@ -200,6 +220,8 @@ public class TestSplitLogManager {
     assertTrue(TaskState.TASK_UNASSIGNED.equals(data, "dummy-master"));
   }
 
+  // Marked as unstable and recorded in #3376834
+  @TestTag({ "unstable" })
   @Test
   public void testOrphanTaskAcquisition() throws Exception {
     LOG.info("TestOrphanTaskAcquisition");
@@ -321,7 +343,7 @@ public class TestSplitLogManager {
       byte[] taskstate = zkw.getData("", tasknode);
       assertTrue(Arrays.equals(TaskState.TASK_UNASSIGNED.get("dummy-master"),
           taskstate));
-      
+
       waitForCounter(tot_mgr_rescan_deleted, 0, 1, 1000);
     } else {
       LOG.warn("Could not run test. Lost ZK connection?");
@@ -430,7 +452,7 @@ public class TestSplitLogManager {
     // now all the nodes are unassigned. manager should post another rescan
     waitForCounter(tot_mgr_resubmit_unassigned, 0, 1, 2 * to + 500);
   }
-  
+
   @Test
   public void testDeadWorker() throws Exception {
     LOG.info("testDeadWorker");
@@ -486,6 +508,7 @@ public class TestSplitLogManager {
     Path logFile = new Path(logDir, UUID.randomUUID().toString());
     fs.createNewFile(logFile);
     new Thread() {
+      @Override
       public void run() {
         try {
           // this call will block because there are no SplitLogWorkers

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionDoubleClose.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionDoubleClose.java?rev=1584171&r1=1584170&r2=1584171&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionDoubleClose.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionDoubleClose.java Wed Apr  2 20:49:34 2014
@@ -30,6 +30,12 @@ import org.apache.commons.logging.LogFac
  */
 public class TestHRegionDoubleClose extends TestHRegionClose {
   private static final Log LOG = LogFactory.getLog(TestHRegionDoubleClose.class);
+
+  @Override
+  public void testMemstoreCleanup() throws Exception {
+    // inherit to skip this redundant case
+  }
+
   @Override
   public void mainTest() throws Exception {
     tryCloseRegion();

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1584171&r1=1584170&r2=1584171&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Wed Apr  2 20:49:34 2014
@@ -46,6 +46,9 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.regionserver.wal.HLog.Reader;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.hbase.util.HasThread;
+import org.apache.hadoop.hbase.util.TagRunner;
+import org.apache.hadoop.hbase.util.TestTag;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
@@ -59,9 +62,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.hadoop.hbase.util.HasThread;
+import org.junit.runner.RunWith;
 
 /** JUnit test case for HLog */
+@RunWith(TagRunner.class)
 public class TestHLog  {
   private static final Log LOG = LogFactory.getLog(TestHLog.class);
   {
@@ -183,6 +187,8 @@ public class TestHLog  {
    * Test new HDFS-265 sync.
    * @throws Exception
    */
+  // Marked as unstable and recorded in 3297526
+  @TestTag({ "unstable" })
   @Test
   public void testSync() throws Exception {
     byte [] bytes = Bytes.toBytes(getName());
@@ -396,6 +402,7 @@ public class TestHLog  {
 
     class RecoverLogThread extends HasThread {
       public Exception exception = null;
+      @Override
       public void run() {
           try {
             FSUtils.recoverFileLease(recoveredFs, walPath, rlConf);
@@ -548,7 +555,7 @@ public class TestHLog  {
       }
     }
   }
-  
+
   @Test
   public void testLogCleaning() throws Exception {
     LOG.info("testLogCleaning");